From 263d1e2c82b1a23a8e7c02c2bc6f2ef2bc06f568 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Wed, 2 Jun 2021 18:14:20 +0800
Subject: [PATCH] Revise homepage colors

- Increase the contrast ratio of the search bar
- Adjust the color of IA icons

Test: visual
Fixes: 179632631
Change-Id: I9b4fc4d671183929d4b2fed27cba8600d56cc74c
---
 res/values-night/colors.xml         | 4 +++-
 res/values/colors.xml               | 2 +-
 res/values/styles.xml               | 7 ++++---
 src/com/android/settings/Utils.java | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index faf7962ee59..979791e9379 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -14,13 +14,15 @@
      limitations under the License.
 -->
 
-<resources>
+<resources
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
     <color name="switchbar_switch_track_tint">#82000000</color>
     <color name="switchbar_switch_thumb_tint">@android:color/black</color>
     <color name="homepage_accessibility_background">#783BE5</color>
     <color name="homepage_support_background">#3F5FBD</color>
     <color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>
     <color name="contextual_card_background">@*android:color/material_grey_900</color>
+    <color name="search_bar_background">?androidprv:attr/colorSurfaceVariant</color>
     <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
     <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->
     <color name="notification_importance_button_unselected">#5F6368</color>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index bd41f1ef08e..d2c6842ba97 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -145,7 +145,7 @@
     <!-- End of QR code scanner colors -->
 
     <!-- Search bar background color -->
-    <color name="search_bar_background">?androidprv:attr/colorSurface</color>
+    <color name="search_bar_background">?androidprv:attr/colorSurfaceHighlight</color>
 
     <color name="face_intro_outline">#ffdadce0</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2a13b32e1e2..5fa2f566bdc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -308,10 +308,11 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
-    <style name="TextAppearance.SearchBar"
-           parent="@*android:style/TextAppearance.DeviceDefault.Widget.Toolbar.Subtitle">
+    <style name="TextAppearance.SearchBar">
+        <item name="android:layout_gravity">center</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:textSize">@dimen/search_bar_text_size</item>
-        <item name="android:textColor">?android:attr/textColorTertiary</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
         <item name="android:singleLine">true</item>
     </style>
 
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 6d4ea264dc5..20ab8065f98 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1220,7 +1220,7 @@ public final class Utils extends com.android.settingslib.Utils {
      */
     @ColorInt
     public static int getHomepageIconColor(Context context) {
-        return getColorAttrDefaultColor(context, android.R.attr.textColorPrimary);
+        return getColorAttrDefaultColor(context, android.R.attr.textColorSecondary);
     }
 
     public static boolean isProviderModelEnabled(Context context) {