[M3][ActionBar] Migrate action bar popup themes to M3

PiperOrigin-RevId: 417454499
material-components · Dec 20, 2021 · 2ae3ca4 · 2ae3ca4
1 parent 9416b2c
commit 2ae3ca4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
@@ -69,8 +69,6 @@
     <item name="android:textColorAlertDialogListItem">@color/m3_default_color_primary_text</item>
 
     <!-- Widget styles. -->
-    <item name="actionBarStyle">@style/Widget.Material3.Light.ActionBar.Solid</item>
-    <item name="actionModeStyle">@style/Widget.Material3.ActionMode</item>
     <item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
     <item name="badgeStyle">@style/Widget.Material3.Badge</item>
     <item name="borderlessButtonStyle">@style/Widget.Material3.Button.TextButton</item>
@@ -129,10 +127,15 @@
     <item name="toolbarSurfaceStyle">@style/Widget.Material3.Toolbar.Surface</item>
 
     <!-- Top App Bars. -->
-    <item name="actionBarSize">@dimen/m3_appbar_size_compact</item>
     <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_appbar_size_medium</item>
     <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_appbar_size_large</item>
 
+    <!-- Action Bars. -->
+    <item name="actionBarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
+    <item name="actionBarSize">@dimen/m3_appbar_size_compact</item>
+    <item name="actionBarStyle">@style/Widget.Material3.Light.ActionBar.Solid</item>
+    <item name="actionModeStyle">@style/Widget.Material3.ActionMode</item>
+
     <!-- Popup Menu styles. -->
     <item name="popupMenuBackground">@drawable/m3_popupmenu_background_overlay</item>
     <item name="listPopupWindowStyle">@style/Widget.Material3.PopupMenu.ListPopupWindow</item>
@@ -255,8 +258,6 @@
     <item name="android:textColorAlertDialogListItem">@color/m3_dark_default_color_primary_text</item>
 
     <!-- Widget styles. -->
-    <item name="actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
-    <item name="actionModeStyle">@style/Widget.Material3.ActionMode</item>
     <item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
     <item name="badgeStyle">@style/Widget.Material3.Badge</item>
     <item name="borderlessButtonStyle">@style/Widget.Material3.Button.TextButton</item>
@@ -315,10 +316,15 @@
     <item name="toolbarSurfaceStyle">@style/Widget.Material3.Toolbar.Surface</item>
 
     <!-- Top App Bars. -->
-    <item name="actionBarSize">@dimen/m3_appbar_size_compact</item>
     <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_appbar_size_medium</item>
     <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_appbar_size_large</item>
 
+    <!-- Action Bars. -->
+    <item name="actionBarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+    <item name="actionBarSize">@dimen/m3_appbar_size_compact</item>
+    <item name="actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
+    <item name="actionModeStyle">@style/Widget.Material3.ActionMode</item>
+
     <!-- Popup Menu styles. -->
     <item name="popupMenuBackground">@drawable/m3_popupmenu_background_overlay</item>
     <item name="listPopupWindowStyle">@style/Widget.Material3.PopupMenu.ListPopupWindow</item>

diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
@@ -80,8 +80,6 @@
     <item name="materialTimePickerTheme">@style/ThemeOverlay.Material3.MaterialTimePicker</item>
 
     <!-- Widget styles. -->
-    <item name="actionBarStyle">@style/Widget.Material3.Light.ActionBar.Solid</item>
-    <item name="actionModeStyle">@style/Widget.Material3.ActionMode</item>
     <item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
     <item name="badgeStyle">@style/Widget.Material3.Badge</item>
     <item name="borderlessButtonStyle">@style/Widget.Material3.Button.TextButton</item>
@@ -140,10 +138,15 @@
     <item name="toolbarSurfaceStyle">@style/Widget.Material3.Toolbar.Surface</item>
 
     <!-- Top App Bars. -->
-    <item name="actionBarSize">@dimen/m3_appbar_size_compact</item>
     <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_appbar_size_medium</item>
     <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_appbar_size_large</item>
 
+    <!-- Action Bars. -->
+    <item name="actionBarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
+    <item name="actionBarSize">@dimen/m3_appbar_size_compact</item>
+    <item name="actionBarStyle">@style/Widget.Material3.Light.ActionBar.Solid</item>
+    <item name="actionModeStyle">@style/Widget.Material3.ActionMode</item>
+
     <!-- Popup Menu styles. -->
     <item name="popupMenuBackground">@drawable/m3_popupmenu_background_overlay</item>
     <item name="listPopupWindowStyle">@style/Widget.Material3.PopupMenu.ListPopupWindow</item>
@@ -271,8 +274,6 @@
     <item name="materialTimePickerTheme">@style/ThemeOverlay.Material3.MaterialTimePicker</item>
 
     <!-- Widget styles. -->
-    <item name="actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
-    <item name="actionModeStyle">@style/Widget.Material3.ActionMode</item>
     <item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
     <item name="badgeStyle">@style/Widget.Material3.Badge</item>
     <item name="borderlessButtonStyle">@style/Widget.Material3.Button.TextButton</item>
@@ -331,10 +332,15 @@
     <item name="toolbarSurfaceStyle">@style/Widget.Material3.Toolbar.Surface</item>
 
     <!-- Top App Bars. -->
-    <item name="actionBarSize">@dimen/m3_appbar_size_compact</item>
     <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_appbar_size_medium</item>
     <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_appbar_size_large</item>
 
+    <!-- Action Bars. -->
+    <item name="actionBarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+    <item name="actionBarSize">@dimen/m3_appbar_size_compact</item>
+    <item name="actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
+    <item name="actionModeStyle">@style/Widget.Material3.ActionMode</item>
+
     <!-- Popup Menu styles. -->
     <item name="popupMenuBackground">@drawable/m3_popupmenu_background_overlay</item>
     <item name="listPopupWindowStyle">@style/Widget.Material3.PopupMenu.ListPopupWindow</item>