From bba5ed7765e4b843877513cd9e518f85da0e43cc Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Thu, 13 May 2021 01:24:07 -0700
Subject: [PATCH] Update bubble user education screens to use proper colors

Bug: 173562716
Test: visual - force user education to show & observe it on the
      stack and manage menu
Change-Id: I6988e2c433f17b69de4aed44c1af3bacb475caf9
---
 .../Shell/res/drawable/bubble_stack_user_education_bg.xml | 5 +++--
 .../res/drawable/bubble_stack_user_education_bg_rtl.xml   | 3 ++-
 .../Shell/res/layout/bubble_stack_user_education.xml      | 4 ++--
 .../Shell/res/layout/bubbles_manage_button_education.xml  | 8 ++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg.xml b/libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg.xml
index 4b9219cd6194b..dcc78213fd9be 100644
--- a/libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg.xml
+++ b/libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg.xml
@@ -14,9 +14,10 @@
   ~ limitations under the License.
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <solid android:color="?android:attr/colorAccent"/>
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:shape="rectangle">
     <corners
         android:bottomRightRadius="360dp"
         android:topRightRadius="360dp" />
+    <solid android:color="?androidprv:attr/colorAccentPrimary" />
 </shape>
\ No newline at end of file
diff --git a/libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg_rtl.xml b/libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg_rtl.xml
index c7baba14b5e56..70b63e62f695a 100644
--- a/libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg_rtl.xml
+++ b/libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg_rtl.xml
@@ -14,9 +14,10 @@
   ~ limitations under the License.
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
-    <solid android:color="?android:attr/colorAccent"/>
     <corners
         android:bottomLeftRadius="360dp"
         android:topLeftRadius="360dp" />
+    <solid android:color="?androidprv:attr/colorAccentPrimary" />
 </shape>
diff --git a/libs/WindowManager/Shell/res/layout/bubble_stack_user_education.xml b/libs/WindowManager/Shell/res/layout/bubble_stack_user_education.xml
index fe6a8bd7643d8..fd4c3ba870264 100644
--- a/libs/WindowManager/Shell/res/layout/bubble_stack_user_education.xml
+++ b/libs/WindowManager/Shell/res/layout/bubble_stack_user_education.xml
@@ -38,7 +38,7 @@
         android:gravity="start"
         android:textAlignment="viewStart"
         android:text="@string/bubbles_user_education_title"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="@android:color/system_neutral1_900"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
 
     <TextView
@@ -49,7 +49,7 @@
         android:gravity="start"
         android:textAlignment="viewStart"
         android:text="@string/bubbles_user_education_description"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="@android:color/system_neutral1_900"
         android:fontFamily="@*android:string/config_bodyFontFamily"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
 </LinearLayout>
diff --git a/libs/WindowManager/Shell/res/layout/bubbles_manage_button_education.xml b/libs/WindowManager/Shell/res/layout/bubbles_manage_button_education.xml
index 3d48e403b059a..c5c42fca323d1 100644
--- a/libs/WindowManager/Shell/res/layout/bubbles_manage_button_education.xml
+++ b/libs/WindowManager/Shell/res/layout/bubbles_manage_button_education.xml
@@ -41,7 +41,7 @@
         android:ellipsize="end"
         android:gravity="start"
         android:textAlignment="viewStart"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="@android:color/system_neutral1_900"
         android:text="@string/bubbles_user_education_manage_title"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
 
@@ -56,7 +56,7 @@
         android:ellipsize="end"
         android:gravity="start"
         android:textAlignment="viewStart"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="@android:color/system_neutral1_900"
         android:fontFamily="@*android:string/config_bodyFontFamily"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
 
@@ -75,7 +75,7 @@
             android:focusable="true"
             android:clickable="false"
             android:text="@string/manage_bubbles_text"
-            android:textColor="?android:attr/textColorPrimaryInverse"
+            android:textColor="@android:color/system_neutral1_900"
             />
 
         <com.android.wm.shell.common.AlphaOptimizedButton
@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:focusable="true"
             android:text="@string/bubbles_user_education_got_it"
-            android:textColor="?android:attr/textColorPrimaryInverse"
+            android:textColor="@android:color/system_neutral1_900"
             />
     </LinearLayout>
 </LinearLayout>