Fix actionMenuTextAppearance on v21-22
Platform bug which was fixed in v23. This CL
fixes it by using AppCompat's own styles pre-v23.
BUG: 25100939
Change-Id: Ibbf8414ed891159c7c5e2b33cf3fb3dd3d9fc80a
diff --git a/v7/appcompat/res/values-v21/themes_base.xml b/v7/appcompat/res/values-v21/themes_base.xml
index 6a4ab87..6c2aa26 100644
--- a/v7/appcompat/res/values-v21/themes_base.xml
+++ b/v7/appcompat/res/values-v21/themes_base.xml
@@ -48,8 +48,6 @@
<item name="actionBarDivider">?android:attr/actionBarDivider</item>
<item name="actionBarItemBackground">@drawable/abc_action_bar_item_background_material</item>
<item name="actionButtonStyle">?android:attr/actionButtonStyle</item>
- <item name="actionMenuTextColor">?android:attr/actionMenuTextColor</item>
- <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item>
<item name="actionModeBackground">?android:attr/actionModeBackground</item>
<item name="actionModeCloseDrawable">?android:attr/actionModeCloseDrawable</item>
<item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item>
@@ -95,8 +93,6 @@
<item name="actionBarDivider">?android:attr/actionBarDivider</item>
<item name="actionBarItemBackground">@drawable/abc_action_bar_item_background_material</item>
<item name="actionButtonStyle">?android:attr/actionButtonStyle</item>
- <item name="actionMenuTextColor">?android:attr/actionMenuTextColor</item>
- <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item>
<item name="actionModeBackground">?android:attr/actionModeBackground</item>
<item name="actionModeCloseDrawable">?android:attr/actionModeCloseDrawable</item>
<item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item>
diff --git a/v7/appcompat/res/values-v23/themes_base.xml b/v7/appcompat/res/values-v23/themes_base.xml
index becb1f2..276a3c6 100644
--- a/v7/appcompat/res/values-v23/themes_base.xml
+++ b/v7/appcompat/res/values-v23/themes_base.xml
@@ -23,6 +23,9 @@
<style name="Base.V23.Theme.AppCompat" parent="Base.V22.Theme.AppCompat">
<!-- We can use the platform drawable on v23+ -->
<item name="actionBarItemBackground">?android:attr/actionBarItemBackground</item>
+ <!-- We can use the platform styles on v23+ -->
+ <item name="actionMenuTextColor">?android:attr/actionMenuTextColor</item>
+ <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item>
<item name="controlBackground">@drawable/abc_control_background_material</item>
</style>
@@ -30,6 +33,9 @@
<style name="Base.V23.Theme.AppCompat.Light" parent="Base.V22.Theme.AppCompat.Light">
<!-- We can use the platform drawable on v23+ -->
<item name="actionBarItemBackground">?android:attr/actionBarItemBackground</item>
+ <!-- We can use the platform styles on v23+ -->
+ <item name="actionMenuTextColor">?android:attr/actionMenuTextColor</item>
+ <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item>
<item name="controlBackground">@drawable/abc_control_background_material</item>
</style>
