DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Top App Bar][ActionMode] Make title and subtitle match ActionBar's

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

PiperOrigin-RevId: 425712147
This commit is contained in:
pfthomas 2022-02-01 14:09:22 -08:00 committed by pekingme
parent f9914da4e9
commit 0f2b5378f7
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/java/com/google/android/material/appbar/res/values/styles.xml
View File

@ -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>

2
lib/java/com/google/android/material/dialog/res/values/themes_base.xml
View File

@ -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>

2
lib/java/com/google/android/material/theme/res/values/themes_base.xml
View File

@ -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>