From dd2efc0073605d75247e715cbf2935ab1fbe36b1 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 15 Apr 2019 14:13:16 -0700
Subject: [PATCH] Update switchbar background color in disabled state.

Fixes: 129991749
Test: visual
Change-Id: Ief3a6a09d2ca905e30e74b7cbd6b4c1500311053
---
 res/values-night/colors.xml | 1 -
 res/values/colors.xml       | 2 +-
 res/values/themes.xml       | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 712925eeee5..f6f86f047ac 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -15,7 +15,6 @@
 -->
 
 <resources>
-  <color name="switchbar_text_color">@android:color/black</color>
   <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>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cfbcd5a1468..1772d27523f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -103,7 +103,7 @@
     <color name="contextual_card_background">@*android:color/background_device_default_light</color>
     <!-- End of dashboard/homepage icon background colors -->
 
-    <color name="switchbar_text_color">@android:color/white</color>
+    <color name="switchbar_background_color">@*android:color/material_grey_600</color>
     <color name="switchbar_switch_track_tint">#BFFFFFFF</color>
     <color name="switchbar_switch_thumb_tint">@android:color/white</color>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 196e85beec6..8c7fe50e2fe 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -87,10 +87,10 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
-    <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar">
+    <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
-        <item name="switchBarBackgroundColor">?android:attr/textColorSecondary</item>
+        <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>
         <item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
         <item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>
     </style>