From b27b45001d69018d4a95a650fdb671a87a304220 Mon Sep 17 00:00:00 2001
From: Yogisha Dixit <ydixit@google.com>
Date: Fri, 16 Jul 2021 15:04:33 +0100
Subject: [PATCH] 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
Merged-In: I28abfd77439a16b4bb637376fd88180d536364cf
---
 res/values-v31/colors.xml | 4 ++--
 res/values/colors.xml     | 4 ++--
 res/values/styles.xml     | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index fb37e858bc..d73ee57080 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 76fd1d7753..1b68fb68a7 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 24851f24c5..d30b80c813 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