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

am f1f7af01: am 05df9029: am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev

Browse Source 
* commit 'f1f7af01deb8e5c2bfd102ed4455e2d3d59c8e72':
  Fix background colors to point directly to theme attribute
This commit is contained in:
Alan Viverette
2014-09-24 17:17:06 +00:00
committed by Android Git Automerger
parent e1cbf3993b f1f7af01de
commit ebaa0f02e7
5 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/colors.xml
View File

@@ -73,13 +73,6 @@
<color name="switchbar_background_color">#ff37474f</color>
<color name="switch_accent_color">#ff7fcac3</color>
<color name="default_preference_background_color">@*android:color/background_material_light</color>
<color name="preference_background_color">@color/default_preference_background_color</color>
<color name="search_panel_list_background_color">@color/default_preference_background_color</color>
<color name="setup_wizard_preference_background_color_dark">@*android:color/background_material_dark</color>
<color name="setup_wizard_preference_background_color_light">@*android:color/background_material_light</color>
<color name="wifi_divider">#ffe0e0e0</color>
</resources>

10
res/values/themes.xml
View File

@@ -42,7 +42,7 @@
<item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_teal</item>
<item name="preferenceBackgroundColor">@color/setup_wizard_preference_background_color_dark</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
</style>
<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
@@ -59,7 +59,7 @@
<item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_teal</item>
<item name="preferenceBackgroundColor">@color/setup_wizard_preference_background_color_light</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
</style>
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -145,6 +145,9 @@
</style>
<style name="Theme.DialogWhenLarge" parent="@android:style/Theme.Material.Light.DialogWhenLarge">
<!-- Explicitly override the background color. -->
<item name="android:colorBackground">@android:color/white</item>
<!-- Used by the ActionBar -->
<item name="android:colorPrimary">@color/theme_primary</item>
<!-- Used by the StatusBar -->
@@ -179,6 +182,9 @@
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
<!-- Explicitly override the background color. -->
<item name="android:colorBackground">@android:color/white</item>
<!-- Used by the ActionBar -->
<item name="android:colorPrimary">@color/theme_primary</item>
<!-- Used by the StatusBar -->