commit 9ab9d1ec82047b74a6a4fc91ab5864086e715c35
author Maurice Lam <yukl@google.com> Sat Dec 20 01:17:58 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 20 01:17:59 2014 +0000
tree bb91273c0ea36469a7bf7bd5d2dbbf0761a50850
parent 3e864c0bdae3ff9801e04438b8347631b3153d6d
parent b413c523c0fecfa318471a76895cb51526a6c57a

Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev

res/values-land/styles.xml

diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 8cbd5e8..974b226 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -34,13 +34,13 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="wifi_item_edit_content">

res/values-sw600dp-land/styles.xml

diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 55fbe04..1a4a40e 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -34,13 +34,13 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="wifi_item_edit_content">

res/values-sw720dp/styles.xml

diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 55fbe04..1a4a40e 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -34,13 +34,13 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="wifi_item_edit_content">

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 162dced..626fc27 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -234,13 +234,13 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="wifi_item_edit_content">