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

Commit 10953234 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update widget manipulation colors to match AOD." into sc-dev am: affe6860 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15311706

Change-Id: I6df9ef80f9b3524c604a0278a78b082d85e06749
parents af36c20b affe6860

res/values-v31/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -42,6 +42,6 @@ 


    <color name="folder_dot_color">@android:color/system_accent2_50</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