From 03fdbbe50430abc72ea716728fbe88035a7d3582 Mon Sep 17 00:00:00 2001
From: mxyyiyi <mxyyiyi@google.com>
Date: Tue, 7 May 2024 13:25:36 +0800
Subject: [PATCH] Use material color res from settingslib for battery tips card

Settings Anomaly Card
[Before-Dark] 	https://screenshot.googleplex.com/5PZC6mbWjqunvuv
[Before-Light] 	https://screenshot.googleplex.com/7eoF6yLX6t3JeHz
[After-Dark]  	https://screenshot.googleplex.com/5j4mQFDXjkVcxHs
[After-Light] 	https://screenshot.googleplex.com/5ySzfzft9293GXb

App Anomaly Card
[Before-Dark] 	https://screenshot.googleplex.com/JKkcqCiAKxkPZds
[Before-Light] 	https://screenshot.googleplex.com/ASB4CnDhPjsQohH
[After-Dark]  	https://screenshot.googleplex.com/5y3LVvng54vndi9
[After-Light] 	https://screenshot.googleplex.com/NCJeuViCtDcNhiV

Bug: 339130556
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I29d68713c14068fd9961082a148dd02ad38289a6
---
 res/color/color_accent_selector.xml          | 2 +-
 res/drawable/battery_hints_chip_bg.xml       | 3 +--
 res/drawable/battery_tips_all_rounded_bg.xml | 2 +-
 res/layout/battery_tips_card.xml             | 4 ++--
 res/layout/power_anomaly_hints.xml           | 2 +-
 res/values-night/colors.xml                  | 1 -
 res/values/colors.xml                        | 3 +--
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/res/color/color_accent_selector.xml b/res/color/color_accent_selector.xml
index 3ccb64068ec..2b4a6b84f60 100644
--- a/res/color/color_accent_selector.xml
+++ b/res/color/color_accent_selector.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/colorAccent"/>
+    <item android:color="@color/settingslib_materialColorPrimary"/>
 </selector>
diff --git a/res/drawable/battery_hints_chip_bg.xml b/res/drawable/battery_hints_chip_bg.xml
index c2b662c2719..e025419e6c0 100644
--- a/res/drawable/battery_hints_chip_bg.xml
+++ b/res/drawable/battery_hints_chip_bg.xml
@@ -16,8 +16,7 @@
   -->
 
 <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="?androidprv:attr/materialColorPrimaryContainer" />
+    <solid android:color="@color/settingslib_materialColorPrimaryContainer" />
     <corners android:radius="@dimen/battery_hints_chip_corner_radius" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/battery_tips_all_rounded_bg.xml b/res/drawable/battery_tips_all_rounded_bg.xml
index 4f61f544074..ba164b97023 100644
--- a/res/drawable/battery_tips_all_rounded_bg.xml
+++ b/res/drawable/battery_tips_all_rounded_bg.xml
@@ -17,6 +17,6 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/settingslib_dialog_background" />
+    <solid android:color="@color/settingslib_materialColorSurfaceBright" />
     <corners android:radius="@dimen/battery_tips_card_corner_radius_normal" />
 </shape>
\ No newline at end of file
diff --git a/res/layout/battery_tips_card.xml b/res/layout/battery_tips_card.xml
index 1a121ba34ea..18c326f8b85 100644
--- a/res/layout/battery_tips_card.xml
+++ b/res/layout/battery_tips_card.xml
@@ -25,7 +25,7 @@
         android:layout_marginTop="8dp"
         android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-        android:textColor="?android:attr/textColorPrimary" />
+        android:textColor="@color/settingslib_materialColorOnSurface" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -55,7 +55,7 @@
             android:paddingHorizontal="16dp"
             android:text="@string/battery_tips_card_action_button"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
-            android:textColor="@color/power_anomaly_primary_button_text_color"
+            android:textColor="@color/settingslib_materialColorOnPrimary"
             app:backgroundTint="@color/color_accent_selector" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/power_anomaly_hints.xml b/res/layout/power_anomaly_hints.xml
index 3781046e626..7ee419e4dcb 100644
--- a/res/layout/power_anomaly_hints.xml
+++ b/res/layout/power_anomaly_hints.xml
@@ -38,6 +38,6 @@
         android:paddingHorizontal="8dp"
         android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
-        android:textColor="?androidprv:attr/materialColorOnSurface"/>
+        android:textColor="@color/settingslib_materialColorOnSurface"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index a27fbaacefc..fb73e6ecc44 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -58,7 +58,6 @@
 
     <!-- Power anomaly color for icons, button and text -->
     <color name="power_anomaly_app_warning_hint_color">#FDD663</color>
-    <color name="power_anomaly_primary_button_text_color">#2E3300</color>
 
     <!-- UDFPS colors -->
     <color name="udfps_enroll_icon">#7DA7F1</color>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 03225a5c447..6d925261979 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -171,9 +171,8 @@
     <!-- Icon tint color for battery usage system icon -->
     <color name="battery_usage_system_icon_color">?android:attr/textColorPrimary</color>
 
-    <!-- Power anomaly color for icons, button and text -->
+    <!-- Power anomaly color for icons, button -->
     <color name="power_anomaly_app_warning_hint_color">#D56E0C</color>
-    <color name="power_anomaly_primary_button_text_color">#FFFFFF</color>
 
     <!-- UDFPS colors -->
     <color name="udfps_enroll_icon">#699FF3</color>