Merge "Update widget manipulation colors to match AOD." into sc-dev
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index fb37e85..d73ee57 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -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>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 76fd1d7..1b68fb6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -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>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 24851f2..d30b80c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -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