PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: e24c760

* commit 'e24c7605119312b0f8333c827663738fb2719e7b':
  [WifiSetup] Fix text colors in dark theme
This commit is contained in:
Maurice Lam
2014-12-20 07:48:45 +00:00
committed by android-build-merger
parent 68b93e68e2 e24c760511
commit 9e1a3d6fc5
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values-land/styles.xml
View File

@@ -34,13 +34,13 @@
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</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>
<style name="wifi_item_content"> <style name="wifi_item_content">
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</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>
<style name="wifi_item_edit_content"> <style name="wifi_item_edit_content">

4
res/values-sw600dp-land/styles.xml
View File

@@ -34,13 +34,13 @@
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</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>
<style name="wifi_item_content"> <style name="wifi_item_content">
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</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>
<style name="wifi_item_edit_content"> <style name="wifi_item_edit_content">

4
res/values-sw720dp/styles.xml
View File

@@ -34,13 +34,13 @@
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</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>
<style name="wifi_item_content"> <style name="wifi_item_content">
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</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>
<style name="wifi_item_edit_content"> <style name="wifi_item_edit_content">

4
res/values/styles.xml
View File

@@ -234,13 +234,13 @@
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</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>
<style name="wifi_item_content"> <style name="wifi_item_content">
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</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>
<style name="wifi_item_edit_content"> <style name="wifi_item_edit_content">