From e8efdc4bd91cf43bfc9e6f945f90841454fa8bad Mon Sep 17 00:00:00 2001
From: fbaron <fbaron@google.com>
Date: Tue, 16 May 2023 16:57:19 -0700
Subject: [PATCH] Update colors for edit state

Bug: 268521231
Test: Verify that edit state colors match the figma attached in the bug
Flag: no flag
Change-Id: I72e5ffde48ca2e53b876b2c86ac5d92c8ddf79c0
---
 ..._bg_color_inactive.xml => cell_layout_bg_color.xml} |  4 ++--
 res/color/cell_layout_bg_color_active.xml              |  5 -----
 res/drawable-v28/bg_celllayout.xml                     |  6 +++---
 res/drawable/bg_celllayout.xml                         |  6 +++---
 res/drawable/drop_target_frame_hover.xml               |  2 +-
 res/values-v31/colors.xml                              |  7 ++++++-
 res/values/attrs.xml                                   |  2 ++
 res/values/colors.xml                                  |  9 +++++++--
 res/values/styles.xml                                  | 10 +++++++---
 9 files changed, 31 insertions(+), 20 deletions(-)
 rename res/color/{cell_layout_bg_color_inactive.xml => cell_layout_bg_color.xml} (58%)
 delete mode 100644 res/color/cell_layout_bg_color_active.xml

diff --git a/res/color/cell_layout_bg_color_inactive.xml b/res/color/cell_layout_bg_color.xml
similarity index 58%
rename from res/color/cell_layout_bg_color_inactive.xml
rename to res/color/cell_layout_bg_color.xml
index 0632100dfc..a33a0c3b2a 100644
--- a/res/color/cell_layout_bg_color_inactive.xml
+++ b/res/color/cell_layout_bg_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.25"
-        android:color="?android:attr/colorAccent"/>
+    <item android:alpha="0.35"
+        android:color="?attr/workspaceSurfaceColor"/>
 </selector>
\ No newline at end of file
diff --git a/res/color/cell_layout_bg_color_active.xml b/res/color/cell_layout_bg_color_active.xml
deleted file mode 100644
index d1a3d7c48f..0000000000
--- a/res/color/cell_layout_bg_color_active.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.3"
-      android:color="?android:attr/colorAccent"/>
-</selector>
diff --git a/res/drawable-v28/bg_celllayout.xml b/res/drawable-v28/bg_celllayout.xml
index c68bdecc81..c9d5e412cb 100644
--- a/res/drawable-v28/bg_celllayout.xml
+++ b/res/drawable-v28/bg_celllayout.xml
@@ -23,15 +23,15 @@
         <shape android:shape="rectangle" >
             <stroke
                 android:width="@dimen/spring_loaded_panel_border"
-                android:color="?android:attr/colorAccent" />
-            <solid android:color="@color/cell_layout_bg_color_active"/>
+                android:color="?attr/workspaceAccentColor" />
+            <solid android:color="@color/cell_layout_bg_color"/>
             <corners android:radius="?android:attr/dialogCornerRadius" />
 
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle" >
-            <solid android:color="@color/cell_layout_bg_color_inactive"/>
+            <solid android:color="@color/cell_layout_bg_color"/>
             <corners android:radius="?android:attr/dialogCornerRadius" />
         </shape>
     </item>
diff --git a/res/drawable/bg_celllayout.xml b/res/drawable/bg_celllayout.xml
index 4e7e82f5f0..dbf893dcb3 100644
--- a/res/drawable/bg_celllayout.xml
+++ b/res/drawable/bg_celllayout.xml
@@ -23,15 +23,15 @@
         <shape android:shape="rectangle" >
             <stroke
                 android:width="@dimen/spring_loaded_panel_border"
-                android:color="?android:attr/colorAccent" />
-            <solid android:color="@color/cell_layout_bg_color_active"/>
+                android:color="?attr/workspaceAccentColor" />
+            <solid android:color="@color/cell_layout_bg_color"/>
             <corners android:radius="@dimen/bg_round_rect_radius" />
 
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle" >
-            <solid android:color="@color/cell_layout_bg_color_inactive"/>
+            <solid android:color="@color/cell_layout_bg_color"/>
             <corners android:radius="@dimen/bg_round_rect_radius" />
         </shape>
     </item>
diff --git a/res/drawable/drop_target_frame_hover.xml b/res/drawable/drop_target_frame_hover.xml
index 6acffd1542..dc83f2cbe2 100644
--- a/res/drawable/drop_target_frame_hover.xml
+++ b/res/drawable/drop_target_frame_hover.xml
@@ -16,6 +16,6 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="?attr/workspaceAccentColor" />
+    <solid android:color="?attr/dropTargetHoverButtonColor" />
     <corners android:radius="@dimen/drop_target_button_frame_radius" />
 </shape>
\ No newline at end of file
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 0c036ff314..a970ae6383 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -57,7 +57,12 @@
     <color name="home_settings_track_off_color">@android:color/system_neutral2_600</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>
+    <color name="workspace_accent_color_dark">@android:color/system_accent1_900</color>
+    <color name="workspace_surface_color">@android:color/system_accent1_100</color>
+    <color name="drop_target_hover_text_color_light">@android:color/system_accent1_900</color>
+    <color name="drop_target_hover_text_color_dark">@android:color/system_accent1_100</color>
+    <color name="drop_target_hover_button_color_light">@android:color/system_accent1_100</color>
+    <color name="drop_target_hover_button_color_dark">@android:color/system_accent1_700</color>
 
     <color name="preload_icon_accent_color_light">@android:color/system_accent1_600</color>
     <color name="preload_icon_background_color_light">@android:color/system_accent2_200</color>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 418f5a73d1..0d094d5bc8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -51,7 +51,9 @@
     <attr name="folderHintColor" format="color" />
     <attr name="isFolderDarkText" format="boolean" />
     <attr name="workspaceAccentColor" format="color" />
+    <attr name="workspaceSurfaceColor" format="color" />
     <attr name="dropTargetHoverTextColor" format="color" />
+    <attr name="dropTargetHoverButtonColor" format="color" />
     <attr name="preloadIconAccentColor" format="color" />
     <attr name="preloadIconBackgroundColor" format="color" />
     <attr name="widgetPickerTitleColor" format="color"/>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b1bff18c8a..bdc5f514af 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -78,8 +78,13 @@
 
     <color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>
 
-    <color name="workspace_accent_color_light">#ff8df5e3</color>
-    <color name="workspace_accent_color_dark">#ff3d665f</color>
+    <color name="workspace_accent_color_light">#D3E3FD</color>
+    <color name="workspace_accent_color_dark">#041E49</color>
+    <color name="workspace_surface_color">#D3E3FD</color>
+    <color name="drop_target_hover_text_color_light">#041E49</color>
+    <color name="drop_target_hover_text_color_dark">#D3E3FD</color>
+    <color name="drop_target_hover_button_color_light">#D3E3FD</color>
+    <color name="drop_target_hover_button_color_dark">#0842A0</color>
 
     <color name="all_apps_button_color">#40484B</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8f75550e10..77d92d9ef1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -61,7 +61,9 @@
         <item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>
         <item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>
         <item name="workspaceAccentColor">@color/workspace_accent_color_light</item>
-        <item name="dropTargetHoverTextColor">@color/workspace_text_color_dark</item>
+        <item name="workspaceSurfaceColor">@color/workspace_surface_color</item>
+        <item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_light</item>
+        <item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_light</item>
         <item name="overviewScrimColor">@color/overview_scrim</item>
         <item name="preloadIconAccentColor">@color/preload_icon_accent_color_light</item>
         <item name="preloadIconBackgroundColor">@color/preload_icon_background_color_light</item>
@@ -90,7 +92,8 @@
         <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>
+        <item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_dark</item>
+        <item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_dark</item>
     </style>
 
     <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -137,7 +140,8 @@
         <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>
+        <item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_dark</item>
+        <item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_dark</item>
     </style>
 
     <!-- A derivative project can extend these themes to customize the application theme without