Automated g4 rollback of changelist 497863181

PiperOrigin-RevId: 498007913
material-components · Dec 29, 2022 · 0200690 · 0200690
1 parent 44445fa
commit 0200690
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 78 deletions.
diff --git a/lib/java/com/google/android/material/appbar/res/values/dimens.xml b/lib/java/com/google/android/material/appbar/res/values/dimens.xml
@@ -20,9 +20,9 @@
 
   <dimen name="mtrl_toolbar_default_height">56dp</dimen>
 
-  <dimen name="m3_appbar_size_compact">@dimen/m3_comp_top_app_bar_small_container_height</dimen>
-  <dimen name="m3_appbar_size_medium">@dimen/m3_comp_top_app_bar_medium_container_height</dimen>
-  <dimen name="m3_appbar_size_large">@dimen/m3_comp_top_app_bar_large_container_height</dimen>
+  <dimen name="m3_appbar_size_compact">64dp</dimen>
+  <dimen name="m3_appbar_size_medium">112dp</dimen>
+  <dimen name="m3_appbar_size_large">152dp</dimen>
 
   <dimen name="m3_appbar_expanded_title_margin_horizontal">16dp</dimen>
   <dimen name="m3_appbar_expanded_title_margin_bottom">16dp</dimen>

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
@@ -149,8 +149,6 @@
   <!-- M3 AppBarLayout styles -->
   <style name="Widget.Material3.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Surface">
     <item name="liftOnScroll">true</item>
-    <item name="elevation">@dimen/m3_comp_top_app_bar_small_container_elevation</item>
-    <item name="android:background">@macro/m3_comp_top_app_bar_small_container_color</item>
 
     <!-- On newer API levels, hide shadows while keeping elevation. -->
     <item name="android:outlineAmbientShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
@@ -159,9 +157,9 @@
 
   <!-- M3 CollapsingToolbarLayout styles -->
   <style name="Base.Widget.Material3.CollapsingToolbar" parent="Widget.MaterialComponents.CollapsingToolbar">
-    <item name="collapsedTitleTextAppearance">@macro/m3_comp_top_app_bar_small_headline_type</item>
-    <item name="collapsedTitleTextColor">@macro/m3_comp_top_app_bar_small_headline_color</item>
-    <item name="expandedTitleTextColor">@macro/m3_comp_top_app_bar_small_headline_color</item>
+    <item name="collapsedTitleTextAppearance">?attr/textAppearanceTitleLarge</item>
+    <item name="collapsedTitleTextColor">?attr/colorOnSurface</item>
+    <item name="expandedTitleTextColor">?attr/colorOnSurface</item>
     <item name="expandedTitleMarginStart">@dimen/m3_appbar_expanded_title_margin_horizontal</item>
     <item name="expandedTitleMarginEnd">@dimen/m3_appbar_expanded_title_margin_horizontal</item>
     <item name="expandedTitleMarginBottom">@dimen/m3_appbar_expanded_title_margin_bottom</item>
@@ -183,21 +181,17 @@
 
   <style name="Widget.Material3.CollapsingToolbar.Medium" parent="Base.Widget.Material3.CollapsingToolbar">
     <item name="scrimVisibleHeightTrigger">@dimen/m3_appbar_scrim_height_trigger_medium</item>
-    <item name="collapsedTitleTextColor">@macro/m3_comp_top_app_bar_medium_headline_color</item>
-    <item name="expandedTitleTextColor">@macro/m3_comp_top_app_bar_medium_headline_color</item>
-    <item name="expandedTitleTextAppearance">@macro/m3_comp_top_app_bar_medium_headline_type</item>
+    <item name="expandedTitleTextAppearance">?attr/textAppearanceHeadlineSmall</item>
   </style>
 
   <style name="Widget.Material3.CollapsingToolbar.Large" parent="Base.Widget.Material3.CollapsingToolbar">
     <item name="scrimVisibleHeightTrigger">@dimen/m3_appbar_scrim_height_trigger_large</item>
-    <item name="collapsedTitleTextColor">@macro/m3_comp_top_app_bar_large_headline_color</item>
-    <item name="expandedTitleTextColor">@macro/m3_comp_top_app_bar_large_headline_color</item>
-    <item name="expandedTitleTextAppearance">@macro/m3_comp_top_app_bar_large_headline_type</item>
+    <item name="expandedTitleTextAppearance">?attr/textAppearanceHeadlineMedium</item>
   </style>
 
   <!-- Style for a M3 Toolbar. -->
   <style name="Widget.Material3.Toolbar" parent="Widget.AppCompat.Toolbar">
-    <item name="titleTextAppearance">@macro/m3_comp_top_app_bar_small_headline_type</item>
+    <item name="titleTextAppearance">?attr/textAppearanceTitleLarge</item>
     <item name="subtitleTextAppearance">?attr/textAppearanceTitleMedium</item>
     <item name="contentInsetStartWithNavigation">0dp</item>
 
@@ -210,57 +204,57 @@
        colors for text and iconography). Use with MaterialToolbar to get
        navigation icon and menu icon coloring. -->
   <style name="Widget.Material3.Toolbar.OnSurface">
-    <item name="titleTextColor">@macro/m3_comp_top_app_bar_small_headline_color</item>
+    <item name="titleTextColor">?attr/colorOnSurface</item>
     <item name="subtitleTextColor">?attr/colorOnSurfaceVariant</item>
-    <item name="navigationIconTint">@macro/m3_comp_top_app_bar_small_leading_icon_color</item>
+    <item name="navigationIconTint">?attr/colorOnSurface</item>
     <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Toolbar.Surface</item>
   </style>
 
   <!-- Style for a M3 Surface Toolbar (surface background and on-surface
        colors for text and iconography). Use with MaterialToolbar to get
        navigation icon and menu icon coloring. -->
   <style name="Widget.Material3.Toolbar.Surface" parent="Widget.Material3.Toolbar.OnSurface">
-    <item name="android:background">@macro/m3_comp_top_app_bar_small_container_color</item>
+    <item name="android:background">?attr/colorSurface</item>
   </style>
 
   <style name="ThemeOverlay.Material3.Toolbar.Surface" parent="">
-    <item name="actionMenuTextColor">@macro/m3_comp_top_app_bar_small_trailing_icon_color</item>
-    <item name="colorControlNormal">@macro/m3_comp_top_app_bar_small_trailing_icon_color</item>
+    <item name="actionMenuTextColor">?attr/colorOnSurfaceVariant</item>
+    <item name="colorControlNormal">?attr/colorOnSurfaceVariant</item>
   </style>
 
   <!-- Style for a M3 ActionBar (inherited from AppCompat due to different
        desired configuration compared to MaterialComponents ActionBars). -->
   <style name="Base.Widget.Material3.ActionBar.Solid" parent="Widget.AppCompat.ActionBar.Solid">
     <item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
     <item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
-    <item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
+    <item name="background">?attr/colorSurface</item>
+    <item name="backgroundStacked">?attr/colorSurface</item>
+    <item name="backgroundSplit">?attr/colorSurface</item>
   </style>
 
   <style name="Widget.Material3.ActionBar.Solid" parent="Base.Widget.Material3.ActionBar.Solid" />
 
   <style name="Base.Widget.Material3.Light.ActionBar.Solid" parent="Widget.AppCompat.Light.ActionBar.Solid">
     <item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
     <item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
-    <item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
+    <item name="background">?attr/colorSurface</item>
+    <item name="backgroundStacked">?attr/colorSurface</item>
+    <item name="backgroundSplit">?attr/colorSurface</item>
   </style>
 
   <style name="Widget.Material3.Light.ActionBar.Solid" parent="Base.Widget.Material3.Light.ActionBar.Solid" />
 
   <style name="Base.Widget.Material3.ActionMode" parent="Widget.AppCompat.ActionMode">
     <item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
     <item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
-    <item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
+    <item name="background">?attr/colorSurface</item>
+    <item name="backgroundSplit">?attr/colorSurface</item>
   </style>
 
   <style name="Widget.Material3.ActionMode" parent="Base.Widget.Material3.ActionMode" />
 
   <style name="TextAppearance.Material3.ActionBar.Title" parent="TextAppearance.Material3.TitleLarge">
-    <item name="android:textColor">@macro/m3_comp_top_app_bar_small_headline_color</item>
+    <item name="android:textColor">?attr/colorOnSurface</item>
   </style>
 
   <style name="TextAppearance.Material3.ActionBar.Subtitle" parent="TextAppearance.Material3.TitleMedium">

diff --git a/lib/java/com/google/android/material/appbar/res/values/tokens.xml b/lib/java/com/google/android/material/appbar/res/values/tokens.xml