From 0f2b5378f709e3eb58fe92d321bf441761860f66 Mon Sep 17 00:00:00 2001
From: pfthomas <pfthomas@google.com>
Date: Tue, 1 Feb 2022 14:09:22 -0800
Subject: [PATCH] [Top App Bar][ActionMode] Make title and subtitle match
 ActionBar's

Resolves https://github.com/material-components/material-components-android/issues/2189

PiperOrigin-RevId: 425712147
---
 .../google/android/material/appbar/res/values/styles.xml  | 8 ++++++++
 .../android/material/dialog/res/values/themes_base.xml    | 2 ++
 .../android/material/theme/res/values/themes_base.xml     | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/lib/java/com/google/android/material/appbar/res/values/styles.xml b/lib/java/com/google/android/material/appbar/res/values/styles.xml
index 3c348ce0355..b8eac003b76 100644
--- a/lib/java/com/google/android/material/appbar/res/values/styles.xml
+++ b/lib/java/com/google/android/material/appbar/res/values/styles.xml
@@ -120,6 +120,14 @@
 
   <style name="Widget.MaterialComponents.ActionBar.PrimarySurface" parent="Widget.MaterialComponents.ActionBar.Primary"/>
 
+  <style name="Widget.MaterialComponents.ActionMode" parent="Widget.AppCompat.ActionMode">
+    <item name="titleTextStyle">?attr/textAppearanceHeadline6</item>
+    <item name="subtitleTextStyle">?attr/textAppearanceSubtitle1</item>
+    <!-- Overrides minimum height in landscape to avoid headline6 and subtitle1 height concerns. -->
+    <item name="android:minHeight">@dimen/mtrl_toolbar_default_height</item>
+    <item name="maxButtonHeight">@dimen/mtrl_toolbar_default_height</item>
+  </style>
+
   <style name="ThemeOverlay.MaterialComponents.ActionBar.Primary" parent="ThemeOverlay.AppCompat.ActionBar">
     <item name="android:textColorPrimary">?attr/colorOnPrimary</item>
     <item name="android:textColorSecondary">@color/material_on_primary_emphasis_medium</item>
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
index 11b3d6c477c..0ec343072c6 100644
--- 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
@@ -437,6 +437,7 @@
     <item name="actionBarStyle">@style/Widget.MaterialComponents.ActionBar.Surface</item>
     <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar.Surface</item>
     <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
+    <item name="actionModeStyle">@style/Widget.MaterialComponents.ActionMode</item>
 
     <!-- Framework, AppCompat, or Design Widget styles -->
     <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
@@ -489,6 +490,7 @@
     <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
     <item name="actionBarStyle">@style/Widget.MaterialComponents.Light.ActionBar.Solid</item>
     <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
+    <item name="actionModeStyle">@style/Widget.MaterialComponents.ActionMode</item>
 
     <!-- Framework, AppCompat, or Design Widget styles -->
     <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</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
index 05f5a644608..afdc1efbc0c 100644
--- 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
@@ -441,6 +441,7 @@
     <item name="actionBarStyle">@style/Widget.MaterialComponents.ActionBar.Surface</item>
     <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar.Surface</item>
     <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
+    <item name="actionModeStyle">@style/Widget.MaterialComponents.ActionMode</item>
 
     <!-- Framework, AppCompat, or Design Widget styles -->
     <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
@@ -503,6 +504,7 @@
     <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
     <item name="actionBarStyle">@style/Widget.MaterialComponents.Light.ActionBar.Solid</item>
     <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
+    <item name="actionModeStyle">@style/Widget.MaterialComponents.ActionMode</item>
 
     <!-- Framework, AppCompat, or Design Widget styles -->
     <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>