Add Settings theme

Also removes unused colors.

Change-Id: Iadf4d72879ea34eab91a9efe02102a6e35be82eb
This commit is contained in:
Alan Viverette
2014-06-11 18:35:18 -07:00
parent 2f2cbbc760
commit 5365c626fc
2 changed files with 5 additions and 27 deletions

View File

@@ -47,27 +47,12 @@
<color name="lock_pattern_view_success_color">#ff009688</color> <color name="lock_pattern_view_success_color">#ff009688</color>
<color name="lock_pattern_view_error_color">#fff4511e</color> <color name="lock_pattern_view_error_color">#fff4511e</color>
<color name="material_blue_grey_50">#ffeceff1</color>
<color name="material_blue_grey_100">#ffcfd8dc</color>
<color name="material_blue_grey_300">#ff90a4ae</color>
<color name="material_blue_grey_500">#ff607d8b</color>
<color name="material_blue_grey_700">#ff455a64</color>
<color name="material_orange_100">#ffffe0b2</color>
<color name="material_orange_300">#ffffb74d</color>
<color name="material_orange_500">#ffff9800</color>
<color name="material_orange_700">#fff57c00</color>
<color name="material_orange_A200">#ffffab40</color>
<color name="material_orange_A400">#ffff9100</color>
<color name="material_accent_color_light">#FF009688</color>
<color name="material_accent_color_dark">#FF80CBC4</color>
<color name="material_empty_color_light">#FFCED7DB</color> <color name="material_empty_color_light">#FFCED7DB</color>
<!-- Palette colors referenced by top-level themes and manually copied into base theme. --> <!-- Palette colors referenced by top-level themes. -->
<color name="theme_primary">#ff263238</color> <color name="theme_primary">#ff263238</color>
<color name="theme_primary_dark">@color/theme_primary</color> <color name="theme_primary_dark">#ff21272b</color>
<color name="theme_accent">@color/material_accent_color_light</color> <color name="theme_accent">#ff009688</color>
<color name="dashboard_background_color">#ffe1e1e0</color> <color name="dashboard_background_color">#ffe1e1e0</color>
<color name="switchbar_background_color">#ff384248</color> <color name="switchbar_background_color">#ff384248</color>

View File

@@ -63,14 +63,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.Material.Light.DarkActionBar"> <style name="Theme.SettingsBase" parent="@android:style/Theme.Material.Settings" />
<!-- Should match @color/theme_primary. -->
<item name="android:colorPrimary">#ff263238</item>
<!-- Should match @color/theme_primary_dark. -->
<item name="android:colorPrimaryDark">#ff263238</item>
<!-- Should match @color/theme_accent. -->
<item name="android:colorAccent">#ff009688</item>
</style>
<style name="Theme.Settings" parent="Theme.SettingsBase"> <style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item> <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
@@ -115,7 +108,7 @@
<item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item> <item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
</style> </style>
<style name="Theme.DialogWhenLarge" parent="android:style/Theme.Material.Light.DialogWhenLarge"> <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.Material.Light.DialogWhenLarge">
<!-- 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 -->