From b8e47fe329a96d4a0f684eef5478f60ec69ea16f Mon Sep 17 00:00:00 2001
From: randypfohl <randypfohl@google.com>
Date: Thu, 4 May 2023 17:18:48 -0700
Subject: [PATCH] Updating overview colors to utilize new tokens

Test: built locally and verified colors
Flag: none
bug:275709319
Change-Id: I1abcf608e0279a70e975190ea66128563f996f3e
---
 quickstep/res/color/menu_item_hover_state_color.xml        | 4 ++--
 quickstep/res/drawable/bg_overview_clear_all_button.xml    | 2 +-
 quickstep/res/drawable/bg_wellbeing_toast.xml              | 4 ++--
 .../res/drawable/keyboard_quick_switch_view_background.xml | 2 +-
 quickstep/res/layout/digital_wellbeing_toast.xml           | 4 ++--
 quickstep/res/layout/overview_clear_all_button.xml         | 3 ++-
 quickstep/res/layout/task_view_menu_option.xml             | 5 +++--
 .../color-v33/overview_scrim.xml                           | 3 +++
 .../color-v33/overview_scrim_dark.xml                      | 3 +++
 res/color/overview_button.xml                              | 7 ++++---
 10 files changed, 23 insertions(+), 14 deletions(-)
 rename quickstep/res/color-night/quick_switch_view_background.xml => res/color-v33/overview_scrim.xml (99%)
 rename quickstep/res/color/quick_switch_view_background.xml => res/color-v33/overview_scrim_dark.xml (99%)

diff --git a/quickstep/res/color/menu_item_hover_state_color.xml b/quickstep/res/color/menu_item_hover_state_color.xml
index 269b9f1c68..1dd7654ad9 100644
--- a/quickstep/res/color/menu_item_hover_state_color.xml
+++ b/quickstep/res/color/menu_item_hover_state_color.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:state_hovered="false" android:color="?androidprv:attr/colorSurface" />
-    <item android:state_hovered="true" android:color="?androidprv:attr/colorSurfaceVariant" />
+    <item android:state_hovered="false" android:color="?androidprv:attr/materialColorSurfaceBright" />
+    <item android:state_hovered="true" android:color="?androidprv:attr/materialColorSurfaceVariant" />
 </selector>
\ No newline at end of file
diff --git a/quickstep/res/drawable/bg_overview_clear_all_button.xml b/quickstep/res/drawable/bg_overview_clear_all_button.xml
index fb014f75b1..f3ff6ce422 100644
--- a/quickstep/res/drawable/bg_overview_clear_all_button.xml
+++ b/quickstep/res/drawable/bg_overview_clear_all_button.xml
@@ -21,7 +21,7 @@
         <shape android:shape="rectangle"
             android:tint="?colorButtonNormal">
             <corners android:radius="24dp" />
-            <solid android:color="?androidprv:attr/colorSurface"/>
+            <solid android:color="?androidprv:attr/materialColorSurfaceBright"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/quickstep/res/drawable/bg_wellbeing_toast.xml b/quickstep/res/drawable/bg_wellbeing_toast.xml
index 4dc981f4a4..0b6684992c 100644
--- a/quickstep/res/drawable/bg_wellbeing_toast.xml
+++ b/quickstep/res/drawable/bg_wellbeing_toast.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
-    <solid android:color="?priv-android:attr/colorAccentPrimary" />
+    <solid android:color="?androidprv:attr/materialColorSecondaryFixed" />
     <corners android:radius="?android:attr/dialogCornerRadius" />
 </shape>
\ No newline at end of file
diff --git a/quickstep/res/drawable/keyboard_quick_switch_view_background.xml b/quickstep/res/drawable/keyboard_quick_switch_view_background.xml
index 573c93ac1d..19aaed46b0 100644
--- a/quickstep/res/drawable/keyboard_quick_switch_view_background.xml
+++ b/quickstep/res/drawable/keyboard_quick_switch_view_background.xml
@@ -16,6 +16,6 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/quick_switch_view_background" />
+    <solid android:color="?attr/overviewScrimColor" />
     <corners android:radius="@dimen/keyboard_quick_switch_view_radius" />
 </shape>
diff --git a/quickstep/res/layout/digital_wellbeing_toast.xml b/quickstep/res/layout/digital_wellbeing_toast.xml
index d5e367097a..42cddbfa0d 100644
--- a/quickstep/res/layout/digital_wellbeing_toast.xml
+++ b/quickstep/res/layout/digital_wellbeing_toast.xml
@@ -16,7 +16,7 @@
 -->
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     style="@style/TextTitle"
     android:layout_width="match_parent"
     android:layout_height="48dp"
@@ -24,7 +24,7 @@
     android:forceHasOverlappingRendering="false"
     android:gravity="center"
     android:importantForAccessibility="noHideDescendants"
-    android:textColor="?priv-android:attr/textColorOnAccent"
+    android:textColor="?androidprv:attr/materialColorOnSecondaryFixed"
     android:textSize="14sp"
     android:autoSizeTextType="uniform"
     android:autoSizeMaxTextSize="14sp"/>
\ No newline at end of file
diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml
index 1dea57e4b7..da94c3a1a7 100644
--- a/quickstep/res/layout/overview_clear_all_button.xml
+++ b/quickstep/res/layout/overview_clear_all_button.xml
@@ -16,10 +16,11 @@
 -->
 <com.android.quickstep.views.ClearAllButton
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     style="@style/OverviewClearAllButton"
     android:id="@+id/clear_all"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:text="@string/recents_clear_all"
-    android:textColor="?android:attr/textColorPrimary"
+    android:textColor="?androidprv:attr/materialColorOnSurface"
     android:textSize="14sp" />
\ No newline at end of file
diff --git a/quickstep/res/layout/task_view_menu_option.xml b/quickstep/res/layout/task_view_menu_option.xml
index 8a8fc36b84..c736c8c8fd 100644
--- a/quickstep/res/layout/task_view_menu_option.xml
+++ b/quickstep/res/layout/task_view_menu_option.xml
@@ -16,6 +16,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
@@ -30,7 +31,7 @@
       android:layout_height="@dimen/system_shortcut_icon_size"
       android:layout_marginStart="@dimen/task_menu_option_start_margin"
       android:layout_gravity="center_horizontal"
-      android:backgroundTint="?android:attr/textColorPrimary"/>
+      android:backgroundTint="?androidprv:attr/materialColorOnSurface"/>
 
     <TextView
         style="@style/BaseIcon"
@@ -39,7 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/task_menu_option_start_margin"
         android:textSize="14sp"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?androidprv:attr/materialColorOnSurface"
         android:focusable="false" />
 
 </LinearLayout>
diff --git a/quickstep/res/color-night/quick_switch_view_background.xml b/res/color-v33/overview_scrim.xml
similarity index 99%
rename from quickstep/res/color-night/quick_switch_view_background.xml
rename to res/color-v33/overview_scrim.xml
index 7280918645..b9cda980b7 100644
--- a/quickstep/res/color-night/quick_switch_view_background.xml
+++ b/res/color-v33/overview_scrim.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2023 The Android Open Source Project
+
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
+
           http://www.apache.org/licenses/LICENSE-2.0
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/quickstep/res/color/quick_switch_view_background.xml b/res/color-v33/overview_scrim_dark.xml
similarity index 99%
rename from quickstep/res/color/quick_switch_view_background.xml
rename to res/color-v33/overview_scrim_dark.xml
index 0eb2a6b915..84d22e6515 100644
--- a/quickstep/res/color/quick_switch_view_background.xml
+++ b/res/color-v33/overview_scrim_dark.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2023 The Android Open Source Project
+
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
+
           http://www.apache.org/licenses/LICENSE-2.0
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml
index aa48b78604..1dd8da60c7 100644
--- a/res/color/overview_button.xml
+++ b/res/color/overview_button.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
     <item
         android:alpha="1"
-        android:color="?android:attr/textColorPrimary"
+        android:color="?androidprv:attr/materialColorOnSurface"
         android:state_enabled="true" />
     <item
         android:alpha="?android:disabledAlpha"
-        android:color="?android:attr/textColorPrimary"
+        android:color="?androidprv:attr/materialColorOnSurface"
         android:state_enabled="false" />
 </selector>
\ No newline at end of file