diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-12 02:00:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-11 21:23:31 +0000 |
| commit | 8cd7dc23ec5e65504ea3f9c8d5869df2b670879d (patch) | |
| tree | c4406ba3b389bbb32c514edfd933994001b6aec6 /res | |
| parent | 9f789fbe082792f57dde72e6c5a501cd0441cd6f (diff) | |
| parent | 5365c626fc56fa4cf7daf6e6d6dc1f04ea3ca13f (diff) | |
| download | packages_apps_Settings-8cd7dc23ec5e65504ea3f9c8d5869df2b670879d.tar.gz packages_apps_Settings-8cd7dc23ec5e65504ea3f9c8d5869df2b670879d.tar.bz2 packages_apps_Settings-8cd7dc23ec5e65504ea3f9c8d5869df2b670879d.zip | |
Merge "Add Settings theme" into lmp-preview-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/colors.xml | 21 | ||||
| -rw-r--r-- | res/values/themes.xml | 11 |
2 files changed, 5 insertions, 27 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 30516a1bf..b835add5a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -47,27 +47,12 @@ <color name="lock_pattern_view_success_color">#ff009688</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> - <!-- 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_dark">@color/theme_primary</color> - <color name="theme_accent">@color/material_accent_color_light</color> + <color name="theme_primary_dark">#ff21272b</color> + <color name="theme_accent">#ff009688</color> <color name="dashboard_background_color">#ffe1e1e0</color> <color name="switchbar_background_color">#ff384248</color> diff --git a/res/values/themes.xml b/res/values/themes.xml index 1aec81323..9087ed125 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -67,14 +67,7 @@ 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 directly. So use #ff263238 instead of @color/theme_primary and so on. --> - <style name="Theme.SettingsBase" parent="@android:style/Theme.Material.Light.DarkActionBar"> - <!-- 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.SettingsBase" parent="@android:style/Theme.Material.Settings" /> <style name="Theme.Settings" parent="Theme.SettingsBase"> <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item> @@ -119,7 +112,7 @@ <item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item> </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 --> <item name="android:colorPrimary">@color/theme_primary</item> <!-- Used by the StatusBar --> |