Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20467307 authored by Yogisha Dixit's avatar Yogisha Dixit
Browse files

Update widget manipulation colors to match AOD. 

This CL makes two changes:
1. Changes the colors we use from system_accent1_50 ->
system_accent1_100 (light wallpapers) and system_accent2_700 ->
system_accent2_600 (dark wallpapers).
2. Changes when we use the light/dark colors. Before: light accent color
when wallpaper luminosity < 0.3. After: light accent color when wallpaper luminosity < 0.7.

Bug: 192359286
Test: manual on light/dark wallpapers with light/dark theme
Change-Id: I28abfd77439a16b4bb637376fd88180d536364cf
parent e4857540

res/values-v31/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -52,6 +52,6 @@ 
    <color name="home_settings_track_on_color">@android:color/system_accent1_600</color>

    <color name="home_settings_track_off_color">@android:color/system_neutral2_600</color>



    <color name="workspace_accent_color_light">@android:color/system_accent2_700</color>

    <color name="workspace_accent_color_dark">@android:color/system_accent1_50</color>

    <color name="workspace_accent_color_light">@android:color/system_accent1_100</color>

    <color name="workspace_accent_color_dark">@android:color/system_accent2_600</color>

</resources>

res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -81,6 +81,6 @@ 
    <color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>

    <color name="wallpaper_scrim_color">#0D878787</color>



    <color name="workspace_accent_color_light">#ff254e47</color>

    <color name="workspace_accent_color_dark">#ff9cfff2</color>

    <color name="workspace_accent_color_light">#ff8df5e3</color>

    <color name="workspace_accent_color_dark">#ff3d665f</color>

</resources>

res/values/styles.xml

+5 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
        <item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>

        <item name="disabledIconAlpha">.54</item>

        <item name="workspaceAccentColor">@color/workspace_accent_color_light</item>

        <item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>

        <item name="dropTargetHoverTextColor">@color/workspace_text_color_dark</item>

        <item name="overviewScrimColor">@color/overview_scrim</item>



        <item name="android:windowTranslucentStatus">false</item>
@@ -75,8 +75,6 @@ 


    <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">

        <item name="disabledIconAlpha">.254</item>

        <item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>

        <item name="dropTargetHoverTextColor">@color/workspace_text_color_dark</item>



    </style>
@@ -87,6 +85,8 @@ 
        <item name="workspaceKeyShadowColor">@android:color/transparent</item>

        <item name="isWorkspaceDarkText">true</item>

        <item name="workspaceStatusBarScrim">@null</item>

        <item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>

        <item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>

    </style>



    <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -133,6 +133,8 @@ 
        <item name="workspaceKeyShadowColor">@android:color/transparent</item>

        <item name="isWorkspaceDarkText">true</item>

        <item name="workspaceStatusBarScrim">@null</item>

        <item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>

        <item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>

    </style>



    <!-- A derivative project can extend these themes to customize the application theme without