diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-12 19:57:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 19:57:25 +0000 |
| commit | 1da878c3021b3078367647d8b52cd421e73e7a13 (patch) | |
| tree | 90714376463d2e89387a6973e3fa3b22cf2026ca /res/values/themes.xml | |
| parent | 3b2be3168794353e8655bb31da5bde337e84c534 (diff) | |
| parent | 8cd7dc23ec5e65504ea3f9c8d5869df2b670879d (diff) | |
| download | packages_apps_Settings-1da878c3021b3078367647d8b52cd421e73e7a13.zip packages_apps_Settings-1da878c3021b3078367647d8b52cd421e73e7a13.tar.gz packages_apps_Settings-1da878c3021b3078367647d8b52cd421e73e7a13.tar.bz2 | |
am 8cd7dc23: Merge "Add Settings theme" into lmp-preview-dev
* commit '8cd7dc23ec5e65504ea3f9c8d5869df2b670879d':
Add Settings theme
Diffstat (limited to 'res/values/themes.xml')
| -rw-r--r-- | res/values/themes.xml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/res/values/themes.xml b/res/values/themes.xml index 9495224..e23b300 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 --> |