From 9f18fc16708deb125c1c7b0ff4ae6f6b248b2166 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Thu, 5 Feb 2015 15:46:49 -0800
Subject: Adding disabled colors for settings.

This mimics what we've had to do in Telephony settings.

Bug: 19237764
Change-Id: I78c7d2b3901f29a12c606aa823cd9abfb0db106a
---
 res/values/colors.xml | 1 +
 res/values/styles.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'res/values')

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6e44f8b44..cd3a804f0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -26,6 +26,7 @@
     <color name="setting_primary_color">@color/dialtacts_primary_text_color</color>
     <!-- Color for the setting description text. -->
     <color name="setting_secondary_color">@color/dialtacts_secondary_text_color</color>
+    <color name="setting_disabled_color">#aaaaaa</color>
     <color name="setting_background_color">#ffffff</color>
     <color name="setting_button_color">#eee</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 82df4ec0f..8bd5f9d8e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -166,9 +166,9 @@
     <!-- Style applied to the "Settings" screen.  Keep in sync with SettingsLight in Telephony. -->
     <style name="SettingsStyle" parent="DialtactsThemeWithoutActionBarOverlay">
         <!-- Setting text. -->
-        <item name="android:textColor">@color/setting_primary_color</item>
+        <item name="android:textColorPrimary">@color/settings_text_color_primary</item>
         <!-- Setting description. -->
-        <item name="android:textColorSecondary">@color/setting_secondary_color</item>
+        <item name="android:textColorSecondary">@color/settings_text_color_secondary</item>
         <item name="android:windowBackground">@color/setting_background_color</item>
         <item name="android:colorAccent">@color/dialtacts_theme_color</item>
         <item name="android:textColorLink">@color/dialtacts_theme_color</item>
-- 
cgit v1.2.3