diff options
| author | Alan Viverette <alanv@google.com> | 2014-04-09 20:37:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-09 20:37:20 +0000 |
| commit | 03bdcfa519766ffe9d331d176eae8c77452bc4ff (patch) | |
| tree | f012f02eecc4ddd9ca8fe4adb1292b86b9bc8281 | |
| parent | 03fee27646564cf1b559b7f8a53d35a1db18d0bd (diff) | |
| parent | 5b6b1bb97bcb7e826dd68656d87ea5468983c259 (diff) | |
| download | frameworks_base-03bdcfa519766ffe9d331d176eae8c77452bc4ff.zip frameworks_base-03bdcfa519766ffe9d331d176eae8c77452bc4ff.tar.gz frameworks_base-03bdcfa519766ffe9d331d176eae8c77452bc4ff.tar.bz2 | |
Merge "Ensure theme attributes are set appropriately"
| -rw-r--r-- | core/res/res/values/themes.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/themes_quantum.xml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 7aea814..37a903a 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -349,6 +349,7 @@ please see themes_device_defaults.xml. <item name="actionMenuTextAppearance">@android:style/TextAppearance.Holo.Widget.ActionBar.Menu</item> <item name="actionMenuTextColor">?android:attr/textColorPrimary</item> <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@null</item> <item name="actionBarDivider">?android:attr/dividerVertical</item> <item name="actionBarItemBackground">?android:attr/selectableItemBackground</item> @@ -1194,6 +1195,7 @@ please see themes_device_defaults.xml. <item name="actionBarSize">@dimen/action_bar_default_height</item> <item name="actionModePopupWindowStyle">@android:style/Widget.Holo.PopupWindow.ActionMode</item> <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@null</item> <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_holo_dark</item> <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_holo_dark</item> @@ -1526,6 +1528,7 @@ please see themes_device_defaults.xml. <item name="actionBarSize">@dimen/action_bar_default_height</item> <item name="actionModePopupWindowStyle">@android:style/Widget.Holo.Light.PopupWindow.ActionMode</item> <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@null</item> <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_holo_light</item> <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_holo_light</item> @@ -1585,6 +1588,7 @@ please see themes_device_defaults.xml. <item name="android:windowContentOverlay">@android:drawable/ab_solid_shadow_holo</item> <item name="android:actionBarStyle">@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse</item> <item name="actionBarWidgetTheme">@android:style/Theme.Holo</item> + <item name="actionBarTheme">@null</item> <item name="actionDropDownStyle">@android:style/Widget.Holo.Spinner.DropDown.ActionBar</item> <item name="actionButtonStyle">@android:style/Widget.Holo.ActionButton</item> diff --git a/core/res/res/values/themes_quantum.xml b/core/res/res/values/themes_quantum.xml index b5ac8fa..2a80c81 100644 --- a/core/res/res/values/themes_quantum.xml +++ b/core/res/res/values/themes_quantum.xml @@ -706,6 +706,7 @@ please see themes_device_defaults.xml. with an inverse color profile. The dark action bar sharply stands out against the light content. --> <style name="Theme.Quantum.Light.DarkActionBar"> + <item name="actionBarWidgetTheme">@null</item> <item name="actionBarTheme">@style/Theme.Quantum</item> </style> |