diff options
author | Maurice Lam <yukl@google.com> | 2014-12-19 11:52:52 -0800 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2014-12-19 11:52:52 -0800 |
commit | b413c523c0fecfa318471a76895cb51526a6c57a (patch) | |
tree | 591e329bb011e49e8151a8b1d8d24a205226bda2 | |
parent | b0c8c3935d5842cfefbe96d958d537fb80d4a33e (diff) | |
download | packages_apps_Settings-b413c523c0fecfa318471a76895cb51526a6c57a.zip packages_apps_Settings-b413c523c0fecfa318471a76895cb51526a6c57a.tar.gz packages_apps_Settings-b413c523c0fecfa318471a76895cb51526a6c57a.tar.bz2 |
[WifiSetup] Fix text colors in dark theme
Use the attribute version of the material colors to avoid dark-on-
dark text in dark theme setup wizard.
Bug: 18810611
Change-Id: I740487e97a48016551f00c6a04876b0d4c71e0ab
-rw-r--r-- | res/values-land/styles.xml | 4 | ||||
-rw-r--r-- | res/values-sw600dp-land/styles.xml | 4 | ||||
-rw-r--r-- | res/values-sw720dp/styles.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 4 |
4 files changed, 8 insertions, 8 deletions
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"> 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"> 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"> 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"> |