diff --git a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
index 54768b373..f9c4ffb74 100644
--- a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
+++ b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
@@ -26,7 +26,7 @@
diff --git a/catalog/java/io/material/catalog/search/res/layout/cat_search_nav_drawer_header.xml b/catalog/java/io/material/catalog/search/res/layout/cat_search_nav_drawer_header.xml
index 959f655fc..0accae2bf 100644
--- a/catalog/java/io/material/catalog/search/res/layout/cat_search_nav_drawer_header.xml
+++ b/catalog/java/io/material/catalog/search/res/layout/cat_search_nav_drawer_header.xml
@@ -24,8 +24,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
- android:src="@drawable/cat_nav_drawer_header"
- tools:ignore="NewApi"/>
+ android:src="@drawable/cat_nav_drawer_header"/>
+ android:src="@drawable/cat_ic_avatar_72"/>
+ app:layout_behavior="@string/side_sheet_behavior">
@@ -33,8 +32,7 @@
android:layout_width="256dp"
android:layout_height="match_parent"
android:orientation="vertical"
- app:layout_behavior="@string/side_sheet_behavior"
- tools:targetApi="lollipop">
+ app:layout_behavior="@string/side_sheet_behavior">
@@ -44,8 +42,7 @@
android:layout_width="256dp"
android:layout_height="match_parent"
android:orientation="vertical"
- app:layout_behavior="@string/side_sheet_behavior"
- tools:targetApi="lollipop">
+ app:layout_behavior="@string/side_sheet_behavior">
@@ -56,8 +53,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
app:coplanarSiblingViewId="@id/nested_scroll_view"
- app:layout_behavior="@string/side_sheet_behavior"
- tools:targetApi="lollipop">
+ app:layout_behavior="@string/side_sheet_behavior">
@@ -68,8 +64,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
app:coplanarSiblingViewId="@id/nested_scroll_view"
- app:layout_behavior="@string/side_sheet_behavior"
- tools:targetApi="lollipop">
+ app:layout_behavior="@string/side_sheet_behavior">
diff --git a/catalog/java/io/material/catalog/transition/res/layout/cat_transition_container_transform_view_fragment.xml b/catalog/java/io/material/catalog/transition/res/layout/cat_transition_container_transform_view_fragment.xml
index 4ffd9ae53..53cbe6f78 100644
--- a/catalog/java/io/material/catalog/transition/res/layout/cat_transition_container_transform_view_fragment.xml
+++ b/catalog/java/io/material/catalog/transition/res/layout/cat_transition_container_transform_view_fragment.xml
@@ -20,8 +20,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:targetApi="lollipop">
+ android:layout_height="match_parent">
diff --git a/catalog/java/io/material/catalog/transition/res/layout/cat_transition_fade_through_albums_fragment.xml b/catalog/java/io/material/catalog/transition/res/layout/cat_transition_fade_through_albums_fragment.xml
index b3d52c6ac..017bfce36 100644
--- a/catalog/java/io/material/catalog/transition/res/layout/cat_transition_fade_through_albums_fragment.xml
+++ b/catalog/java/io/material/catalog/transition/res/layout/cat_transition_fade_through_albums_fragment.xml
@@ -42,8 +42,7 @@
app:columnCount="2"
app:rowCount="3"
android:gravity="center_horizontal"
- app:orientation="vertical"
- tools:targetApi="lollipop">
+ app:orientation="vertical">
+ app:rowCount="3">
+ android:padding="4dp">
+ app:layout_behavior="@string/appbar_scrolling_view_behavior">
+ android:transitionGroup="true">
+ android:orientation="vertical">
+ android:transitionGroup="true">
+ android:layout_height="match_parent">
```
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 cb5b72922..2755efdb3 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
@@ -19,11 +19,9 @@
@@ -58,7 +56,7 @@
@@ -211,8 +207,8 @@
- 0dp
- - @android:color/transparent
- - @android:color/transparent
+ - @android:color/transparent
+ - @android:color/transparent
-
+
@@ -178,7 +178,7 @@
- @macro/m3_comp_button_small_label_text
- @style/ShapeAppearance.M3.Comp.Button.Small.Container.Shape.Round
- @style/ThemeOverlay.Material3.Button
- - @animator/m3_btn_state_list_anim
+ - @animator/m3_btn_state_list_anim
- @dimen/m3_comp_button_filled_container_elevation
- @color/m3_button_foreground_color_selector
- @color/m3_button_foreground_color_selector
@@ -198,7 +198,7 @@
@@ -283,9 +283,7 @@
@@ -188,7 +184,7 @@
- @dimen/m3_comp_input_chip_container_height
- @dimen/m3_comp_input_chip_with_avatar_avatar_size
- @dimen/m3_comp_input_chip_unselected_outline_width
- - @dimen/m3_comp_input_chip_container_elevation
+ - @dimen/m3_comp_input_chip_container_elevation
- 4dp
- 0dp
@@ -204,12 +200,8 @@
@@ -224,12 +216,8 @@
@@ -257,7 +245,7 @@
- @dimen/m3_comp_suggestion_chip_container_height
- @dimen/m3_comp_suggestion_chip_with_leading_icon_leading_icon_size
- @dimen/m3_comp_suggestion_chip_flat_outline_width
- - @dimen/m3_comp_suggestion_chip_flat_container_elevation
+ - @dimen/m3_comp_suggestion_chip_flat_container_elevation
- 8dp
- 0dp
@@ -274,12 +262,10 @@
@@ -309,7 +295,7 @@
- @dimen/m3_comp_assist_chip_container_height
- @dimen/m3_comp_assist_chip_with_icon_icon_size
- @dimen/m3_comp_assist_chip_flat_outline_width
- - @dimen/m3_comp_assist_chip_flat_container_elevation
+ - @dimen/m3_comp_assist_chip_flat_container_elevation
- 8dp
- 0dp
@@ -326,12 +312,8 @@
@@ -348,7 +330,7 @@
- @dimen/m3_comp_filter_chip_container_height
- @dimen/m3_comp_filter_chip_with_icon_icon_size
- @dimen/m3_comp_filter_chip_flat_unselected_outline_width
- - @dimen/m3_comp_filter_chip_flat_container_elevation
+ - @dimen/m3_comp_filter_chip_flat_container_elevation
- 8dp
- 0dp
@@ -365,11 +347,8 @@
diff --git a/lib/java/com/google/android/material/color/res/values/theme_overlay.xml b/lib/java/com/google/android/material/color/res/values/theme_overlay.xml
index d9a962736..04e765346 100644
--- a/lib/java/com/google/android/material/color/res/values/theme_overlay.xml
+++ b/lib/java/com/google/android/material/color/res/values/theme_overlay.xml
@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
@@ -91,13 +91,13 @@
@@ -142,7 +142,7 @@
@@ -229,9 +219,7 @@
- @color/m3_efab_ripple_color_selector
- @dimen/m3_comp_extended_fab_primary_container_height
- @dimen/m3_comp_extended_fab_primary_container_elevation
- -
- @animator/m3_extended_fab_state_list_animator
-
+ - @animator/m3_extended_fab_state_list_animator
- @dimen/m3_comp_extended_fab_primary_icon_size
- @macro/m3_comp_extended_fab_primary_label_text_type
- @macro/m3_comp_extended_fab_primary_container_shape
@@ -262,14 +250,10 @@
diff --git a/lib/java/com/google/android/material/search/res/values/styles.xml b/lib/java/com/google/android/material/search/res/values/styles.xml
index 72d92800e..3c6c85ec8 100644
--- a/lib/java/com/google/android/material/search/res/values/styles.xml
+++ b/lib/java/com/google/android/material/search/res/values/styles.xml
@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
@@ -45,7 +45,7 @@
explicitly on the modal side sheet View. -->
- @dimen/m3_side_sheet_width
- match_parent
- - @dimen/m3_side_sheet_modal_elevation
+ - @dimen/m3_side_sheet_modal_elevation
- @macro/m3_comp_sheet_side_docked_modal_container_color
- @macro/m3_comp_sheet_side_docked_modal_container_shape
diff --git a/lib/java/com/google/android/material/snackbar/res/values/styles.xml b/lib/java/com/google/android/material/snackbar/res/values/styles.xml
index 737bc3853..8e7030f35 100644
--- a/lib/java/com/google/android/material/snackbar/res/values/styles.xml
+++ b/lib/java/com/google/android/material/snackbar/res/values/styles.xml
@@ -57,7 +57,7 @@
- @dimen/material_emphasis_high_type
- end
- @integer/design_snackbar_text_max_lines
- - viewStart
+ - viewStart
- ?attr/textAppearanceBody2
- ?attr/colorSurface
- @dimen/design_snackbar_padding_vertical
diff --git a/lib/java/com/google/android/material/textfield/res/values-v23/styles.xml b/lib/java/com/google/android/material/textfield/res/values-v23/styles.xml
index fdf5ec61b..dcae3ea46 100644
--- a/lib/java/com/google/android/material/textfield/res/values-v23/styles.xml
+++ b/lib/java/com/google/android/material/textfield/res/values-v23/styles.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
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 759b363e7..f9c886717 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
@@ -248,7 +248,7 @@
- ?attr/textAppearanceTitleMedium
- ?attr/textAppearanceTitleMedium
- - ?attr/textAppearanceBodyMedium
+ - ?attr/textAppearanceBodyMedium
- ?attr/textAppearanceTitleMedium
- ?attr/textAppearanceTitleMedium
- ?attr/textAppearanceBodyMedium
@@ -538,7 +538,7 @@
- ?attr/textAppearanceTitleMedium
- ?attr/textAppearanceTitleMedium
- - ?attr/textAppearanceBodyMedium
+ - ?attr/textAppearanceBodyMedium
- ?attr/textAppearanceTitleMedium
- ?attr/textAppearanceTitleMedium
- ?attr/textAppearanceBodyMedium
@@ -656,8 +656,8 @@
- @style/ThemeOverlay.MaterialComponents.BottomSheetDialog
- @style/ThemeOverlay.MaterialComponents.Dialog.Alert
- @style/ThemeOverlay.MaterialComponents.MaterialAlertDialog
- - @style/ThemeOverlay.MaterialComponents.Dialog
- - @style/ThemeOverlay.MaterialComponents.Dialog
+ - @style/ThemeOverlay.MaterialComponents.Dialog
+ - @style/ThemeOverlay.MaterialComponents.Dialog
- ?attr/textAppearanceSubtitle1
@@ -723,8 +723,8 @@
- @style/ThemeOverlay.MaterialComponents.BottomSheetDialog
- @style/ThemeOverlay.MaterialComponents.Dialog.Alert
- @style/ThemeOverlay.MaterialComponents.MaterialAlertDialog
- - @style/ThemeOverlay.MaterialComponents.Dialog
- - @style/ThemeOverlay.MaterialComponents.Dialog
+ - @style/ThemeOverlay.MaterialComponents.Dialog
+ - @style/ThemeOverlay.MaterialComponents.Dialog
- ?attr/textAppearanceSubtitle1
diff --git a/lib/java/com/google/android/material/timepicker/res/values/themes.xml b/lib/java/com/google/android/material/timepicker/res/values/themes.xml
index 96d4ccff4..94cdf6582 100644
--- a/lib/java/com/google/android/material/timepicker/res/values/themes.xml
+++ b/lib/java/com/google/android/material/timepicker/res/values/themes.xml
@@ -29,7 +29,7 @@
diff --git a/lib/javatests/com/google/android/material/theme/res/values/styles.xml b/lib/javatests/com/google/android/material/theme/res/values/styles.xml
index adc2f8390..c03acb813 100644
--- a/lib/javatests/com/google/android/material/theme/res/values/styles.xml
+++ b/lib/javatests/com/google/android/material/theme/res/values/styles.xml
@@ -15,14 +15,14 @@
~ limitations under the License.
-->
-
+
-
-