diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-23 20:37:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-23 18:44:51 +0000 |
| commit | 289a63f509972372e37fc95de630a5410b4ebd5c (patch) | |
| tree | 752bd8dafe2a6db044f7f6c11c7a072ce9ba77a7 /res/values/themes.xml | |
| parent | a79400defc90a65437589cd5ede8de291692c75f (diff) | |
| parent | 9c3f11fa05ba8ab479a2d6cc64e707ac02e9a727 (diff) | |
| download | packages_apps_Settings-289a63f509972372e37fc95de630a5410b4ebd5c.zip packages_apps_Settings-289a63f509972372e37fc95de630a5410b4ebd5c.tar.gz packages_apps_Settings-289a63f509972372e37fc95de630a5410b4ebd5c.tar.bz2 | |
Merge "Fix NotificationStation theming" into lmp-dev
Diffstat (limited to 'res/values/themes.xml')
| -rw-r--r-- | res/values/themes.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/res/values/themes.xml b/res/values/themes.xml index 898274f..cc2a480 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -88,15 +88,14 @@ <item name="ic_wps">@drawable/ic_wps_dark</item> <item name="wifi_signal">@drawable/wifi_signal_light</item> + <!-- Redefine the ActionBar style for contentInsetStart --> + <item name="android:actionBarStyle">@style/Theme.ActionBar</item> <item name="@*android:actionBarSize">@dimen/actionbar_size</item> <item name="switchBarTheme">@style/Theme.SwitchBar.Settings</item> <item name="preferenceBackgroundColor">@drawable/preference_background</item> - <!-- Redefine the ActionBar style for contentInsetStart --> - <item name="android:actionBarStyle">@style/Theme.ActionBar</item> - <!-- For all Alert Dialogs --> <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item> @@ -182,8 +181,9 @@ </style> <style name="Theme.NotificationStation" parent="@android:style/Theme.Material"> - <item name="switchBarMarginStart">0dip</item> - <item name="switchBarMarginEnd">0dip</item> + <!-- Redefine the ActionBar style for contentInsetStart --> + <item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item> + <item name="@*android:actionBarSize">@dimen/actionbar_size</item> <item name="preferenceBackgroundColor">@android:color/transparent</item> </style> |