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

Merge "Fix background colors to point directly to theme attribute" into lmp-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-09-24 01:25:06 +00:00
committed by Android (Google) Code Review
parent a1c6a0c895 f81f72ffed
commit 3156e38f5e
5 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/drawable/default_preference_background.xml
View File

@@ -15,15 +15,8 @@
--> -->
<inset xmlns:android="http://schemas.android.com/apk/res/android" <inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="0dip" android:inset="0dip">
android:insetTop="0dip"
android:insetRight="0dip"
android:insetBottom="0dip">
<shape android:shape="rectangle"> <color android:color="?android:attr/colorBackground" />
<solid android:color="@color/default_preference_background_color" />
</shape>
</inset> </inset>

9
res/drawable/preference_background.xml
View File

@@ -15,13 +15,8 @@
--> -->
<inset xmlns:android="http://schemas.android.com/apk/res/android" <inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="0dip" android:inset="0dip">
android:insetTop="0dip"
android:insetRight="0dip"
android:insetBottom="0dip">
<shape android:shape="rectangle"> <color android:color="?android:attr/colorBackground" />
<solid android:color="@color/preference_background_color" />
</shape>
</inset> </inset>

11
res/drawable/search_panel_list_background.xml
View File

@@ -15,15 +15,8 @@
--> -->
<inset xmlns:android="http://schemas.android.com/apk/res/android" <inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="0dip" android:inset="0dip">
android:insetTop="0dip"
android:insetRight="0dip"
android:insetBottom="0dip">
<shape android:shape="rectangle"> <color android:color="?android:attr/colorBackground" />
<solid android:color="@color/search_panel_list_background_color" />
</shape>
</inset> </inset>

7
res/values/colors.xml
View File

@@ -73,13 +73,6 @@
<color name="switchbar_background_color">#ff37474f</color> <color name="switchbar_background_color">#ff37474f</color>
<color name="switch_accent_color">#ff7fcac3</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> <color name="wifi_divider">#ffe0e0e0</color>
</resources> </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="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_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_teal</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>
<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar"> <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="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_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_teal</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>
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert"> <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -145,6 +145,9 @@
</style> </style>
<style name="Theme.DialogWhenLarge" parent="@android:style/Theme.Material.Light.DialogWhenLarge"> <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 --> <!-- Used by the ActionBar -->
<item name="android:colorPrimary">@color/theme_primary</item> <item name="android:colorPrimary">@color/theme_primary</item>
<!-- Used by the StatusBar --> <!-- Used by the StatusBar -->
@@ -179,6 +182,9 @@
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert"> <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item> <item name="android:windowSoftInputMode">adjustResize</item>
<!-- Explicitly override the background color. -->
<item name="android:colorBackground">@android:color/white</item>
<!-- Used by the ActionBar --> <!-- Used by the ActionBar -->
<item name="android:colorPrimary">@color/theme_primary</item> <item name="android:colorPrimary">@color/theme_primary</item>
<!-- Used by the StatusBar --> <!-- Used by the StatusBar -->