From e300b0fc1cdab5553bcfab50c0e068e84c065d50 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Sun, 19 Jun 2016 18:40:36 -0700
Subject: [PATCH] Use colorSecondary for switch bar backgrounds.

Delete the private version in favor of using the platform's.

BUG: 28625050
Change-Id: I6bf0a13e5018f48f32a26a38307c30cf1aee0619
---
 res/drawable/switchbar_background.xml | 2 +-
 res/values/attrs.xml                  | 2 --
 res/values/colors.xml                 | 2 --
 res/values/themes.xml                 | 9 +++------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/res/drawable/switchbar_background.xml b/res/drawable/switchbar_background.xml
index 3d729fdec67..a58f2e9f2f1 100644
--- a/res/drawable/switchbar_background.xml
+++ b/res/drawable/switchbar_background.xml
@@ -16,6 +16,6 @@
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="?attr/colorSecondary" />
+    <item android:drawable="?android:attr/colorSecondary" />
 </ripple>
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index ffc233b3e60..8fb61dd3f2a 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -121,8 +121,6 @@
     <attr name="switchBarMarginEnd" format="dimension" />
     <attr name="switchBarBackgroundColor" format="color" />
 
-    <attr name="colorSecondary" format="color" />
-
     <attr name="preferenceBackgroundColor" format="color" />
 
     <!-- Confirm device credentials screen -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ccc521c2c80..1a4d66597c0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -124,8 +124,6 @@
 
     <color name="card_background_grey">#eeeeee</color>
 
-    <color name="secondary_color">#ff37474f</color>
-
     <!-- Gestures settings -->
     <color name="gestures_setting_backgroud_color">#f5f5f5</color>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1268e4d42f2..43bb55c295c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -129,9 +129,7 @@
          layouts against a remote context using our local theme colors. Due to the implementation
          details of Theme, we can't reference any local resources and MUST instead use the values
          directly. So use #ff263238 instead of @color/theme_primary and so on. -->
-    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings">
-        <item name="colorSecondary">@color/secondary_color</item>
-    </style>
+    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />
 
     <style name="Theme.Settings" parent="Theme.SettingsBase">
         <item name="preferenceTheme">@style/PreferenceTheme</item>
@@ -196,17 +194,16 @@
     <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent">
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
-        <item name="switchBarBackgroundColor">?attr/colorSecondary</item>
+        <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>
     </style>
 
     <style name="ThemeOverlay.SwitchBar.SubSettings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
-        <item name="switchBarBackgroundColor">?attr/colorSecondary</item>
+        <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>
     </style>
 
     <style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.DeviceDefault.Settings.DialogWhenLarge">
-        <item name="colorSecondary">@color/secondary_color</item>
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>