diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/public.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/themes_quantum.xml | 21 |
2 files changed, 16 insertions, 8 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 6239926..88e1cda 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2274,9 +2274,10 @@ <public type="style" name="ThemeOverlay" /> <public type="style" name="ThemeOverlay.Quantum" /> + <public type="style" name="ThemeOverlay.Quantum.ActionBar" /> <public type="style" name="ThemeOverlay.Quantum.Light" /> <public type="style" name="ThemeOverlay.Quantum.Dark" /> - <public type="style" name="ThemeOverlay.Quantum.ActionBarWidget" /> + <public type="style" name="ThemeOverlay.Quantum.Dark.ActionBar" /> <public type="style" name="Widget.Quantum" /> <public type="style" name="Widget.Quantum.ActionBar" /> diff --git a/core/res/res/values/themes_quantum.xml b/core/res/res/values/themes_quantum.xml index fb3b57d..f47ea7a 100644 --- a/core/res/res/values/themes_quantum.xml +++ b/core/res/res/values/themes_quantum.xml @@ -306,8 +306,8 @@ please see themes_device_defaults.xml. <item name="actionBarStyle">@style/Widget.Quantum.ActionBar.Solid</item> <item name="actionBarSize">@dimen/action_bar_default_height_quantum</item> <item name="actionModePopupWindowStyle">@style/Widget.Quantum.PopupWindow.ActionMode</item> - <item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item> - <item name="actionBarTheme">@null</item> + <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@style/ThemeOverlay.Quantum.ActionBar</item> <item name="actionBarItemBackground">?attr/selectableItemBackgroundBorderless</item> <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item> @@ -652,8 +652,8 @@ please see themes_device_defaults.xml. <item name="actionBarStyle">@style/Widget.Quantum.Light.ActionBar.Solid</item> <item name="actionBarSize">@dimen/action_bar_default_height_quantum</item> <item name="actionModePopupWindowStyle">@style/Widget.Quantum.Light.PopupWindow.ActionMode</item> - <item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item> - <item name="actionBarTheme">@null</item> + <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@style/ThemeOverlay.Quantum.ActionBar</item> <item name="actionBarItemBackground">?attr/selectableItemBackgroundBorderless</item> <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item> @@ -728,8 +728,8 @@ 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">@style/ThemeOverlay.Quantum.ActionBarWidget</item> - <item name="actionBarTheme">@style/ThemeOverlay.Quantum.Dark</item> + <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@style/ThemeOverlay.Quantum.Dark.ActionBar</item> </style> <style name="ThemeOverlay" /> @@ -810,7 +810,14 @@ please see themes_device_defaults.xml. <!-- Theme overlay that replaces the normal control color, which by default is the same as the secondary text color, with the primary text color. --> - <style name="ThemeOverlay.Quantum.ActionBarWidget"> + <style name="ThemeOverlay.Quantum.ActionBar"> + <item name="colorControlNormal">?attr/textColorPrimary</item> + </style> + + <!-- Theme overlay that replaces colors with their dark versions and replaces the normal + control color, which by default is the same as the secondary text color, with the primary + text color. --> + <style name="ThemeOverlay.Quantum.Dark.ActionBar"> <item name="colorControlNormal">?attr/textColorPrimary</item> </style> |