From f43f2f80a76ebaabef1f32a4305aaaa0def7d009 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Thu, 6 May 2021 17:35:40 +0800
Subject: [PATCH] Apply the new search bar background color

Fixes: 182092326
Test: visual, robotest
Change-Id: I95bd73323e8407716261367461f008bafa35e78b
---
 res/values-night/colors.xml | 1 -
 res/values-night/themes.xml | 6 ------
 res/values/colors.xml       | 7 ++++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 168fd0db585..2cdbd3f107a 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -21,7 +21,6 @@
     <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">@*android:color/material_grey_900</color>
     <!-- Dialog background color. -->
     <color name="dialog_background">@*android:color/material_grey_800</color>
     <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index 604610d37f0..d80b271d14b 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -23,12 +23,6 @@
         <item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
     </style>
 
-    <style name="ThemeOverlay.Settings.SearchBar" parent="Theme.Settings">
-        <item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
-        <item name="cardBackgroundColor">?android:attr/colorPrimary</item>
-        <item name="android:colorControlNormal">?android:attr/colorAccent</item>
-    </style>
-
     <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
 
     <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index be324125a4f..ab8489cd4e7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<resources>
+<resources
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
 
     <color name="crypt_keeper_clock_background">#ff9a9a9a</color>
     <color name="crypt_keeper_clock_foreground">#ff666666</color>
@@ -144,7 +145,7 @@
     <!-- End of QR code scanner colors -->
 
     <!-- Search bar background color -->
-    <color name="search_bar_background">@android:color/white</color>
+    <color name="search_bar_background">?androidprv:attr/colorSurface</color>
 
     <!-- Dialog background color -->
     <color name="dialog_background">@*android:color/background_device_default_light</color>
@@ -200,4 +201,4 @@
     <color name="accessibility_color_inversion_background">#546E7A</color>
 
     <color name="battery_info_error_color_red">#fce8e6</color> <!-- Material Red 50 -->
-</resources>
\ No newline at end of file
+</resources>