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

Merge "Use colorSecondary for switch bar backgrounds." into nyc-mr1-dev

Browse Source
This commit is contained in:
Andrew Sapperstein
2016-06-23 18:37:40 +00:00
committed by Android (Google) Code Review
parent c3a0a18f77 e300b0fc1c
commit da926355c0
4 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/drawable/switchbar_background.xml
View File

@@ -16,6 +16,6 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight"> android:color="?android:attr/colorControlHighlight">
<item android:drawable="?attr/colorSecondary" /> <item android:drawable="?android:attr/colorSecondary" />
</ripple> </ripple>

2
res/values/attrs.xml
View File

@@ -121,8 +121,6 @@
<attr name="switchBarMarginEnd" format="dimension" /> <attr name="switchBarMarginEnd" format="dimension" />
<attr name="switchBarBackgroundColor" format="color" /> <attr name="switchBarBackgroundColor" format="color" />
<attr name="colorSecondary" format="color" />
<attr name="preferenceBackgroundColor" format="color" /> <attr name="preferenceBackgroundColor" format="color" />
<!-- Confirm device credentials screen --> <!-- Confirm device credentials screen -->

2
res/values/colors.xml
View File

@@ -124,8 +124,6 @@
<color name="card_background_grey">#eeeeee</color> <color name="card_background_grey">#eeeeee</color>
<color name="secondary_color">#ff37474f</color>
<!-- Gestures settings --> <!-- Gestures settings -->
<color name="gestures_setting_backgroud_color">#f5f5f5</color> <color name="gestures_setting_backgroud_color">#f5f5f5</color>

9
res/values/themes.xml
View File

@@ -129,9 +129,7 @@
layouts against a remote context using our local theme colors. Due to the implementation layouts against a remote context using our local theme colors. Due to the implementation
details of Theme, we can't reference any local resources and MUST instead use the values details of Theme, we can't reference any local resources and MUST instead use the values
directly. So use #ff263238 instead of @color/theme_primary and so on. --> directly. So use #ff263238 instead of @color/theme_primary and so on. -->
<style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings"> <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />
<item name="colorSecondary">@color/secondary_color</item>
</style>
<style name="Theme.Settings" parent="Theme.SettingsBase"> <style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="preferenceTheme">@style/PreferenceTheme</item> <item name="preferenceTheme">@style/PreferenceTheme</item>
@@ -196,17 +194,16 @@
<style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent"> <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent">
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item> <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item> <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
<item name="switchBarBackgroundColor">?attr/colorSecondary</item> <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>
</style> </style>
<style name="ThemeOverlay.SwitchBar.SubSettings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar"> <style name="ThemeOverlay.SwitchBar.SubSettings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item> <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item> <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
<item name="switchBarBackgroundColor">?attr/colorSecondary</item> <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>
</style> </style>
<style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.DeviceDefault.Settings.DialogWhenLarge"> <style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.DeviceDefault.Settings.DialogWhenLarge">
<item name="colorSecondary">@color/secondary_color</item>
<!-- Redefine the ActionBar style for contentInsetStart --> <!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar</item> <item name="android:actionBarStyle">@style/Theme.ActionBar</item>