Snap for 10331563 from 06278b9e8c49e41b34e733307ff679a4467995d5 to udc-release
Change-Id: I4dd5c479bc16c67723422f45e64ed2649e830b1e
diff --git a/res/values-night-v31/styles.xml b/res/values-night-v31/styles.xml
index 0cbb57b..0bbda89 100644
--- a/res/values-night-v31/styles.xml
+++ b/res/values-night-v31/styles.xml
@@ -16,11 +16,11 @@
-->
<resources>
- <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
- <item name="colorControlNormal">?android:textColorSecondary</item>
+ <!--
+ <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">
<item name="android:actionMenuTextColor">@*android:color/accent_device_default_dark</item>
- <item name="android:textAllCaps">false</item>
</style>
+ -->
<style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">
<item name="android:textSize">14sp</item>
diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
index ad2d98c..c82ff58 100644
--- a/res/values-v31/styles.xml
+++ b/res/values-v31/styles.xml
@@ -22,13 +22,13 @@
<item name="android:textSize">12sp</item>
</style>
- <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
- <item name="colorControlNormal">?android:textColorSecondary</item>
+ <!--
+ <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">
<item name="android:actionMenuTextColor">
@*android:color/accent_device_default_light
</item>
- <item name="android:textAllCaps">false</item>
</style>
+ -->
<style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
<item name="android:textAppearance">@style/MaterialButtonTextAppearance
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b27f2ea..1efd1d5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,10 +15,20 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+ <style name="ActionBarThemeCommon" parent="@style/ThemeOverlay.AppCompat.ActionBar">
<item name="colorControlNormal">?android:textColorSecondary</item>
+ <!-- Modern platform themes set actionMenuTextColor to textColorPrimary. For example,
+ see Theme.Material in frameworks/base/core/res/res/values/themes_material.xml.
+ However, if the platform theme does not set actionMenuTextColor we are going to
+ crash, so let's set it here. Additionally, most of our ActionBarTheme themes
+ override this -->
+ <item name="android:actionMenuTextColor">?android:textColorPrimary</item>
+ <item name="android:textAllCaps">false</item>
</style>
+ <!-- This gets overridden for specific platform versions and/or configs -->
+ <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon"/>
+
<style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
<!-- attr "height" was used by support lib should not in overlay scope -->
<item name="height">@dimen/action_bar_size</item>
