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

[Internal] Update targetApi suppressions in resources

Browse Source 
Resolves https://github.com/material-components/material-components-android/pull/4308

GIT_ORIGIN_REV_ID=8016db9460e4e1013e56a50e541406ff356e2837
PiperOrigin-RevId: 702111281
This commit is contained in:
pubiqq 2024-12-02 23:57:58 +00:00 committed by pfthomas
parent 1696ec3dcd
commit c1c19c8b3a
35 changed files with 127 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
catalog/java/io/material/catalog/application/theme/res/values/themes.xml
View File

@ -26,7 +26,7 @@
<!-- A theme which sets the status bar color to transparent -->
<style name="Theme.Catalog.TransparentStatus">
<item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="CatalogPreferenceThemeOverlay" parent="PreferenceThemeOverlay">

2
catalog/java/io/material/catalog/musicplayer/res/values/styles.xml
View File

@ -20,7 +20,7 @@
<item name="colorSecondary">@color/cat_music_player_secondary</item>
<item name="colorOnSecondary">@color/cat_music_player_on_secondary</item>
<item name="android:statusBarColor" tools:targetApi="lollipop">?attr/colorControlNormal</item>
<item name="android:statusBarColor">?attr/colorControlNormal</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">?attr/isLightTheme</item>
</style>

6
catalog/java/io/material/catalog/search/res/layout/cat_search_nav_drawer_header.xml
View File

@ -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"/>
<LinearLayout
android:layout_width="wrap_content"
@ -41,8 +40,7 @@
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginBottom="20dp"
android:src="@drawable/cat_ic_avatar_72"
tools:ignore="NewApi"/>
android:src="@drawable/cat_ic_avatar_72"/>
<TextView
android:layout_width="wrap_content"

15
catalog/java/io/material/catalog/sidesheet/res/layout/cat_sidesheets.xml
View File

@ -22,8 +22,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">
<include layout="@layout/cat_sidesheet_content" />
</FrameLayout>
@ -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">
<include layout="@layout/cat_sidesheet_detached_content" />
</FrameLayout>
@ -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">
<include layout="@layout/cat_sidesheet_content_vertically_scrolling" />
</FrameLayout>
@ -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">
<include layout="@layout/cat_sidesheet_content_coplanar" />
</FrameLayout>
@ -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">
<include layout="@layout/cat_sidesheet_content_coplanar_detached" />
</FrameLayout>
</merge>

3
catalog/java/io/material/catalog/transition/res/layout/cat_transition_container_transform_view_fragment.xml
View File

@ -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">
<include layout="@layout/cat_transition_list_fragment" />

3
catalog/java/io/material/catalog/transition/res/layout/cat_transition_fade_through_albums_fragment.xml
View File

@ -42,8 +42,7 @@
app:columnCount="2"
app:rowCount="3"
android:gravity="center_horizontal"
app:orientation="vertical"
tools:targetApi="lollipop">
app:orientation="vertical">
<com.google.android.material.card.MaterialCardView
android:layout_width="0dp"

3
catalog/java/io/material/catalog/transition/res/layout/cat_transition_fade_through_photos_fragment.xml
View File

@ -40,8 +40,7 @@
android:gravity="center_horizontal"
app:columnCount="2"
app:orientation="vertical"
app:rowCount="3"
tools:targetApi="lollipop">
app:rowCount="3">
<ImageView
android:layout_width="0dp"

3
catalog/java/io/material/catalog/transition/res/layout/cat_transition_fade_through_search_fragment.xml
View File

@ -43,8 +43,7 @@
app:rowCount="3"
android:gravity="center_horizontal"
app:orientation="vertical"
android:padding="4dp"
tools:targetApi="lollipop">
android:padding="4dp">
<com.google.android.material.card.MaterialCardView
android:layout_width="0dp"

3
catalog/java/io/material/catalog/transition/res/layout/cat_transition_list_fragment.xml
View File

@ -21,8 +21,7 @@
android:id="@+id/scrolling_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:targetApi="lollipop">
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:layout_width="match_parent"

3
catalog/java/io/material/catalog/transition/res/layout/cat_transition_shared_axis_end_activity.xml
View File

@ -21,8 +21,7 @@
android:id="@+id/end_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:transitionGroup="true"
tools:targetApi="lollipop">
android:transitionGroup="true">
<FrameLayout
android:id="@+id/end_layout"

3
catalog/java/io/material/catalog/transition/res/layout/cat_transition_shared_axis_fragment.xml
View File

@ -19,8 +19,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:targetApi="lollipop">
android:orientation="vertical">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_container"

3
catalog/java/io/material/catalog/transition/res/layout/cat_transition_shared_axis_start_activity.xml
View File

@ -21,8 +21,7 @@
android:id="@+id/start_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:transitionGroup="true"
tools:targetApi="lollipop">
android:transitionGroup="true">
<FrameLayout
android:id="@+id/start_layout"

3
catalog/java/io/material/catalog/transition/res/layout/cat_transition_shared_axis_view_fragment.xml
View File

@ -20,8 +20,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:targetApi="lollipop">
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/start_view"

2
docs/components/BottomSheet.md
View File

@ -215,7 +215,7 @@ To enable edge-to-edge by default for modal bottom sheets, you can override
</style>
<style name="ThemeOverlay.App.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
<item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent<item>
</style>
```

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

@ -19,11 +19,9 @@
<!-- AppBarLayout styles -->
<style name="Widget.Design.AppBarLayout" parent="android:Widget">
<item name="android:background">?attr/colorPrimary</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/design_appbar_state_list_animator
</item>
<item name="android:keyboardNavigationCluster" tools:ignore="NewApi">true</item>
<item name="android:touchscreenBlocksFocus" tools:ignore="NewApi">true</item>
<item name="android:stateListAnimator">@animator/design_appbar_state_list_animator</item>
<item name="android:keyboardNavigationCluster" tools:targetApi="o">true</item>
<item name="android:touchscreenBlocksFocus">true</item>
</style>
<style name="Widget.MaterialComponents.AppBarLayout.Primary" parent="Widget.Design.AppBarLayout"/>
@ -58,7 +56,7 @@
</style>
<style name="Widget.MaterialComponents.Toolbar.Primary">
<item name="android:elevation" tools:ignore="NewApi">@dimen/design_appbar_elevation</item>
<item name="android:elevation">@dimen/design_appbar_elevation</item>
<item name="android:background">?attr/colorPrimary</item>
<item name="titleTextColor">?attr/colorOnPrimary</item>
<item name="subtitleTextColor">@color/material_on_primary_emphasis_medium</item>
@ -151,13 +149,11 @@
<item name="liftOnScroll">true</item>
<item name="android:background">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="liftOnScrollColor">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_appbar_state_list_animator
</item>
<item name="android:stateListAnimator">@animator/m3_appbar_state_list_animator</item>
<!-- On newer API levels, hide shadows while keeping elevation. -->
<item name="android:outlineAmbientShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
<item name="android:outlineSpotShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
<item name="android:outlineAmbientShadowColor" tools:targetApi="p">@android:color/transparent</item>
<item name="android:outlineSpotShadowColor" tools:targetApi="p">@android:color/transparent</item>
</style>
<!-- M3 CollapsingToolbarLayout styles -->
@ -211,8 +207,8 @@
<item name="contentInsetStartWithNavigation">0dp</item>
<!-- On newer API levels, hide shadows while keeping elevation. -->
<item name="android:outlineAmbientShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
<item name="android:outlineSpotShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
<item name="android:outlineAmbientShadowColor" tools:targetApi="p">@android:color/transparent</item>
<item name="android:outlineSpotShadowColor" tools:targetApi="p">@android:color/transparent</item>
</style>
<!-- Style for a M3 On Surface Toolbar (transparent background and on-surface

2
lib/java/com/google/android/material/badge/res/values/styles.xml
View File

@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi">
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Widget.MaterialComponents.Badge" parent="android:Widget">
<item name="badgeWidth">@dimen/mtrl_badge_size</item>

16
lib/java/com/google/android/material/bottomsheet/res/values/styles.xml
View File

@ -29,9 +29,7 @@
<style name="Widget.Design.BottomSheet.Modal" parent="android:Widget">
<item name="enforceMaterialTheme">false</item>
<item name="android:background">?android:attr/colorBackground</item>
<item name="android:elevation" tools:ignore="NewApi">
@dimen/design_bottom_sheet_modal_elevation
</item>
<item name="android:elevation">@dimen/design_bottom_sheet_modal_elevation</item>
<item name="behavior_peekHeight">auto</item>
<item name="behavior_hideable">true</item>
<item name="behavior_skipCollapsed">false</item>
@ -47,16 +45,12 @@
<item name="shapeAppearance">?attr/shapeAppearanceLargeComponent</item>
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.MaterialComponents.BottomSheet</item>
<item name="backgroundTint">?attr/colorSurface</item>
<item name="android:elevation" tools:ignore="NewApi">
@dimen/design_bottom_sheet_elevation
</item>
<item name="android:elevation">@dimen/design_bottom_sheet_elevation</item>
<item name="android:maxWidth">@dimen/material_bottom_sheet_max_width</item>
</style>
<style name="Widget.MaterialComponents.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet">
<item name="android:elevation" tools:ignore="NewApi">
@dimen/design_bottom_sheet_modal_elevation
</item>
<item name="android:elevation">@dimen/design_bottom_sheet_modal_elevation</item>
</style>
<style name="ShapeAppearanceOverlay.MaterialComponents.BottomSheet" parent="">
@ -66,7 +60,7 @@
<!-- Style for the M3 Bottom Sheet. -->
<style name="Widget.Material3.BottomSheet" parent="Widget.MaterialComponents.BottomSheet">
<item name="android:elevation" tools:ignore="NewApi">@dimen/m3_bottom_sheet_elevation</item>
<item name="android:elevation">@dimen/m3_bottom_sheet_elevation</item>
<item name="marginLeftSystemWindowInsets">true</item>
<item name="marginRightSystemWindowInsets">true</item>
<item name="paddingBottomSystemWindowInsets">true</item>
@ -80,7 +74,7 @@
</style>
<style name="Widget.Material3.BottomSheet.Modal">
<item name="android:elevation" tools:ignore="NewApi">@dimen/m3_bottom_sheet_modal_elevation</item>
<item name="android:elevation">@dimen/m3_bottom_sheet_modal_elevation</item>
</style>
<style name="Animation.Material3.BottomSheetDialog" parent="Animation.AppCompat.Dialog">

12
lib/java/com/google/android/material/button/res/values/styles.xml
View File

@ -37,7 +37,7 @@
<item name="android:insetTop">@dimen/mtrl_btn_inset</item>
<item name="android:insetBottom">@dimen/mtrl_btn_inset</item>
<item name="android:maxWidth">@dimen/mtrl_btn_max_width</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">@animator/mtrl_btn_state_list_anim</item>
<item name="android:stateListAnimator">@animator/mtrl_btn_state_list_anim</item>
<item name="cornerRadius">@null</item>
<item name="elevation">@dimen/mtrl_btn_elevation</item>
<item name="iconPadding">@dimen/mtrl_btn_icon_padding</item>
@ -56,7 +56,7 @@
</style>
<style name="Widget.MaterialComponents.Button.UnelevatedButton">
<item name="android:stateListAnimator" tools:ignore="NewApi">@animator/mtrl_btn_unelevated_state_list_anim</item>
<item name="android:stateListAnimator">@animator/mtrl_btn_unelevated_state_list_anim</item>
<item name="elevation">0dp</item>
</style>
@ -178,7 +178,7 @@
<item name="android:textAppearance">@macro/m3_comp_button_small_label_text</item>
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.Button.Small.Container.Shape.Round</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">@animator/m3_btn_state_list_anim</item>
<item name="android:stateListAnimator">@animator/m3_btn_state_list_anim</item>
<item name="elevation">@dimen/m3_comp_button_filled_container_elevation</item>
<item name="android:textColor">@color/m3_button_foreground_color_selector</item>
<item name="iconTint">@color/m3_button_foreground_color_selector</item>
@ -198,7 +198,7 @@
</style>
<style name="Widget.Material3.Button.UnelevatedButton">
<item name="android:stateListAnimator" tools:ignore="NewApi">@animator/mtrl_btn_unelevated_state_list_anim</item>
<item name="android:stateListAnimator">@animator/mtrl_btn_unelevated_state_list_anim</item>
<item name="elevation">0dp</item>
</style>
@ -283,9 +283,7 @@
<!-- M3 elevated button style. -->
<style name="Widget.Material3.Button.ElevatedButton">
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_btn_elevated_btn_state_list_anim
</item>
<item name="android:stateListAnimator">@animator/m3_btn_elevated_btn_state_list_anim</item>
<item name="android:textColor">@color/m3_text_button_foreground_color_selector</item>
<item name="elevation">@dimen/m3_comp_button_elevated_container_elevation</item>
<item name="iconTint">@color/m3_text_button_foreground_color_selector</item>

12
lib/java/com/google/android/material/card/res/values/styles.xml
View File

@ -21,9 +21,7 @@
<style name="Widget.MaterialComponents.CardView" parent="CardView">
<item name="enforceMaterialTheme">true</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/mtrl_card_state_list_anim
</item>
<item name="android:stateListAnimator">@animator/mtrl_card_state_list_anim</item>
<item name="cardBackgroundColor">?attr/colorSurface</item>
<item name="cardCornerRadius">@null</item>
<item name="cardElevation">@dimen/mtrl_card_elevation</item>
@ -39,9 +37,7 @@
<!-- Style for the M3 card. -->
<style name="Base.Widget.Material3.CardView" parent="Widget.MaterialComponents.CardView">
<item name="enforceMaterialTheme">true</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_card_state_list_anim
</item>
<item name="android:stateListAnimator">@animator/m3_card_state_list_anim</item>
<item name="cardElevation">@dimen/m3_card_elevation</item>
<item name="cardForegroundColor">@color/m3_card_foreground_color</item>
<item name="rippleColor">@color/m3_card_ripple_color</item>
@ -68,9 +64,7 @@
</style>
<style name="Widget.Material3.CardView.Elevated" parent="Base.Widget.Material3.CardView">
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_card_elevated_state_list_anim
</item>
<item name="android:stateListAnimator">@animator/m3_card_elevated_state_list_anim</item>
<item name="strokeWidth">0dp</item>
<item name="cardElevation">@dimen/m3_card_elevated_elevation</item>
<item name="cardBackgroundColor">@macro/m3_comp_elevated_card_container_color</item>

53
lib/java/com/google/android/material/chip/res/values/styles.xml
View File

@ -26,9 +26,7 @@
<item name="android:focusable">true</item>
<item name="android:clickable">true</item>
<item name="android:checkable">false</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/mtrl_chip_state_list_anim
</item>
<item name="android:stateListAnimator">@animator/mtrl_chip_state_list_anim</item>
<item name="chipIconVisible">true</item>
<item name="checkedIconVisible">true</item>
@ -163,9 +161,7 @@
<item name="checkedIcon">@drawable/ic_m3_chip_checked_circle</item>
<item name="closeIcon">@drawable/ic_m3_chip_close</item>
<item name="chipIconSize">@dimen/m3_chip_icon_size</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_chip_state_list_anim
</item>
<item name="android:stateListAnimator">@animator/m3_chip_state_list_anim</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Chip</item>
</style>
@ -188,7 +184,7 @@
<item name="chipMinHeight">@dimen/m3_comp_input_chip_container_height</item>
<item name="chipIconSize">@dimen/m3_comp_input_chip_with_avatar_avatar_size</item>
<item name="chipStrokeWidth">@dimen/m3_comp_input_chip_unselected_outline_width</item>
<item name="android:elevation" tools:ignore="NewApi">@dimen/m3_comp_input_chip_container_elevation</item>
<item name="android:elevation">@dimen/m3_comp_input_chip_container_elevation</item>
<item name="chipStartPadding">4dp</item>
<item name="iconStartPadding">0dp</item>
@ -204,12 +200,8 @@
<!-- Style for input Chip, to be used when placed against a background
that needs protection, such as an image. -->
<style name="Widget.Material3.Chip.Input.Elevated">
<item name="android:elevation" tools:ignore="NewApi">
@dimen/m3_chip_elevated_elevation
</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_elevated_chip_state_list_anim
</item>
<item name="android:elevation">@dimen/m3_chip_elevated_elevation</item>
<item name="android:stateListAnimator">@animator/m3_elevated_chip_state_list_anim</item>
<item name="chipStrokeColor">@android:color/transparent</item>
<item name="chipBackgroundColor">@color/m3_elevated_chip_background_color</item>
</style>
@ -224,12 +216,8 @@
<!-- Style for Input Chip with system icons, to be used when placed against a
background that needs protection, such as an image. -->
<style name="Widget.Material3.Chip.Input.Icon.Elevated">
<item name="android:elevation" tools:ignore="NewApi">
@dimen/m3_chip_elevated_elevation
</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_elevated_chip_state_list_anim
</item>
<item name="android:elevation">@dimen/m3_chip_elevated_elevation</item>
<item name="android:stateListAnimator">@animator/m3_elevated_chip_state_list_anim</item>
<item name="chipStrokeColor">@android:color/transparent</item>
<item name="chipBackgroundColor">@color/m3_elevated_chip_background_color</item>
</style>
@ -257,7 +245,7 @@
<item name="chipMinHeight">@dimen/m3_comp_suggestion_chip_container_height</item>
<item name="chipIconSize">@dimen/m3_comp_suggestion_chip_with_leading_icon_leading_icon_size</item>
<item name="chipStrokeWidth">@dimen/m3_comp_suggestion_chip_flat_outline_width</item>
<item name="android:elevation" tools:ignore="NewApi">@dimen/m3_comp_suggestion_chip_flat_container_elevation</item>
<item name="android:elevation">@dimen/m3_comp_suggestion_chip_flat_container_elevation</item>
<item name="chipStartPadding">8dp</item>
<item name="iconStartPadding">0dp</item>
@ -274,12 +262,10 @@
<!-- Style for Suggestion Chip, to be used when placed against a background
that needs protection, such as an image. -->
<style name="Widget.Material3.Chip.Suggestion.Elevated">
<item name="android:elevation" tools:ignore="NewApi">
<item name="android:elevation">
@dimen/m3_comp_suggestion_chip_elevated_container_elevation
</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_elevated_chip_state_list_anim
</item>
<item name="android:stateListAnimator">@animator/m3_elevated_chip_state_list_anim</item>
<item name="chipStrokeColor">@android:color/transparent</item>
<item name="chipBackgroundColor">@color/m3_elevated_chip_background_color</item>
</style>
@ -309,7 +295,7 @@
<item name="chipMinHeight">@dimen/m3_comp_assist_chip_container_height</item>
<item name="chipIconSize">@dimen/m3_comp_assist_chip_with_icon_icon_size</item>
<item name="chipStrokeWidth">@dimen/m3_comp_assist_chip_flat_outline_width</item>
<item name="android:elevation" tools:ignore="NewApi">@dimen/m3_comp_assist_chip_flat_container_elevation</item>
<item name="android:elevation">@dimen/m3_comp_assist_chip_flat_container_elevation</item>
<item name="chipStartPadding">8dp</item>
<item name="iconStartPadding">0dp</item>
@ -326,12 +312,8 @@
<!-- Style for Assist Chip to be used against a background that needs
protection, such as an image. -->
<style name="Widget.Material3.Chip.Assist.Elevated">
<item name="android:elevation" tools:ignore="NewApi">
@dimen/m3_comp_assist_chip_elevated_container_elevation
</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_elevated_chip_state_list_anim
</item>
<item name="android:elevation">@dimen/m3_comp_assist_chip_elevated_container_elevation</item>
<item name="android:stateListAnimator">@animator/m3_elevated_chip_state_list_anim</item>
<item name="chipStrokeColor">@android:color/transparent</item>
<item name="chipBackgroundColor">@color/m3_elevated_chip_background_color</item>
</style>
@ -348,7 +330,7 @@
<item name="chipMinHeight">@dimen/m3_comp_filter_chip_container_height</item>
<item name="chipIconSize">@dimen/m3_comp_filter_chip_with_icon_icon_size</item>
<item name="chipStrokeWidth">@dimen/m3_comp_filter_chip_flat_unselected_outline_width</item>
<item name="android:elevation" tools:ignore="NewApi">@dimen/m3_comp_filter_chip_flat_container_elevation</item>
<item name="android:elevation">@dimen/m3_comp_filter_chip_flat_container_elevation</item>
<item name="chipStartPadding">8dp</item>
<item name="iconStartPadding">0dp</item>
@ -365,11 +347,8 @@
<!-- Style for Filter Chip to be used against a background that needs
protection, such as an image. -->
<style name="Widget.Material3.Chip.Filter.Elevated">
<item name="android:elevation" tools:ignore="NewApi">
@dimen/m3_comp_filter_chip_elevated_container_elevation</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_elevated_chip_state_list_anim
</item>
<item name="android:elevation">@dimen/m3_comp_filter_chip_elevated_container_elevation</item>
<item name="android:stateListAnimator">@animator/m3_elevated_chip_state_list_anim</item>
<item name="chipStrokeColor">@android:color/transparent</item>
<item name="chipBackgroundColor">@color/m3_elevated_chip_background_color</item>
</style>

2
lib/java/com/google/android/material/color/res/values/theme_overlay.xml
View File

@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi">
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="ThemeOverlay.Material3.HarmonizedColors" parent="">
<item name="colorError">@color/material_harmonized_color_error</item>

4
lib/java/com/google/android/material/datepicker/res/values/themes.xml
View File

@ -64,7 +64,7 @@
</style>
<style name="ThemeOverlay.Material3.MaterialCalendar" parent="ThemeOverlay.Material3.Dialog">
<item name="android:windowElevation" tools:ignore="NewApi">@dimen/m3_datepicker_elevation</item>
<item name="android:windowElevation">@dimen/m3_datepicker_elevation</item>
<item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
<!-- Header Styles -->
@ -92,7 +92,7 @@
<style name="ThemeOverlay.Material3.MaterialCalendar.Fullscreen">
<item name="android:windowIsFloating">false</item>
<item name="android:windowElevation" tools:ignore="NewApi">@dimen/m3_datepicker_elevation</item>
<item name="android:windowElevation">@dimen/m3_datepicker_elevation</item>
<item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar.Fullscreen</item>
<item name="materialCalendarHeaderLayout">@style/Widget.Material3.MaterialCalendar.HeaderLayout.Fullscreen</item>
<item name="materialCalendarHeaderSelection">@style/Widget.Material3.MaterialCalendar.HeaderSelection.Fullscreen</item>

14
lib/java/com/google/android/material/dialog/res/values/styles.xml
View File

@ -79,7 +79,7 @@
<style name="MaterialAlertDialog.MaterialComponents.Title.Icon"
parent="Base.MaterialAlertDialog.MaterialComponents.Title.Icon">
<item name="android:layout_gravity">start|center_vertical</item>
<item name="android:layout_marginEnd" tools:ignore="NewApi">8dip</item>
<item name="android:layout_marginEnd">8dip</item>
<item name="android:layout_marginRight">8dip</item>
</style>
@ -91,13 +91,13 @@
<style name="MaterialAlertDialog.MaterialComponents.Title.Text"
parent="Base.MaterialAlertDialog.MaterialComponents.Title.Text">
<item name="android:layout_gravity">start|center_vertical</item>
<item name="android:textAlignment" tools:ignore="NewApi">viewStart</item>
<item name="android:textAlignment">viewStart</item>
</style>
<style name="MaterialAlertDialog.MaterialComponents.Title.Text.CenterStacked"
parent="Base.MaterialAlertDialog.MaterialComponents.Title.Text">
<item name="android:layout_gravity">center</item>
<item name="android:textAlignment" tools:ignore="NewApi">center</item>
<item name="android:textAlignment">center</item>
</style>
<style name="MaterialAlertDialog.MaterialComponents.Body.Text" parent="TextAppearance.MaterialComponents.Body2">
@ -131,7 +131,7 @@
<style name="MaterialAlertDialog.Material3.Title.Icon" parent="MaterialAlertDialog.MaterialComponents.Title.Icon">
<item name="android:layout_width">@dimen/m3_alert_dialog_icon_size</item>
<item name="android:layout_height">@dimen/m3_alert_dialog_icon_size</item>
<item name="android:layout_marginEnd" tools:ignore="NewApi">@dimen/m3_alert_dialog_icon_margin</item>
<item name="android:layout_marginEnd">@dimen/m3_alert_dialog_icon_margin</item>
<item name="android:layout_marginRight">@dimen/m3_alert_dialog_icon_margin</item>
<item name="android:theme">@style/ThemeOverlay.MaterialAlertDialog.Material3.Title.Icon</item>
</style>
@ -142,7 +142,7 @@
</style>
<style name="MaterialAlertDialog.Material3.Title.Icon.CenterStacked">
<item name="android:layout_marginEnd" tools:ignore="NewApi">0dp</item>
<item name="android:layout_marginEnd">0dp</item>
<item name="android:layout_marginRight">0dp</item>
<item name="android:layout_marginBottom">@dimen/m3_alert_dialog_icon_margin</item>
<item name="android:layout_gravity">center</item>
@ -156,7 +156,7 @@
<style name="MaterialAlertDialog.Material3.Title.Text.CenterStacked">
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center</item>
<item name="android:textAlignment" tools:ignore="NewApi">gravity</item>
<item name="android:textAlignment">gravity</item>
</style>
<style name="MaterialAlertDialog.Material3.Body.Text" parent="">
@ -167,7 +167,7 @@
<style name="MaterialAlertDialog.Material3.Body.Text.CenterStacked">
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center</item>
<item name="android:textAlignment" tools:ignore="NewApi">gravity</item>
<item name="android:textAlignment">gravity</item>
</style>
<style name="MaterialAlertDialog.Material3.Animation">

10
lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml
View File

@ -29,8 +29,8 @@
<!-- Widget styles -->
<item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_invisible</item>
<item name="alertDialogStyle">@style/MaterialAlertDialog.MaterialComponents</item>
<item name="android:checkedTextViewStyle" tools:ignore="NewApi">@style/Widget.MaterialComponents.CheckedTextView</item>
<item name="android:dialogCornerRadius" tools:ignore="newApi">@null</item>
<item name="android:checkedTextViewStyle">@style/Widget.MaterialComponents.CheckedTextView</item>
<item name="android:dialogCornerRadius" tools:targetApi="p">@null</item>
<item name="buttonBarButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog</item>
<item name="buttonBarPositiveButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog</item>
<item name="buttonBarNegativeButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog</item>
@ -108,7 +108,7 @@
-->
<style name="ThemeOverlay.Material3.Dialog.Alert" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
<item name="buttonBarButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog.Flush</item>
<item name="android:windowElevation" tools:ignore="NewApi">@dimen/m3_alert_dialog_elevation</item>
<item name="android:windowElevation">@dimen/m3_alert_dialog_elevation</item>
</style>
<!--
@ -132,8 +132,8 @@
-->
<style name="ThemeOverlay.Material3.MaterialAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="alertDialogStyle">@style/MaterialAlertDialog.Material3</item>
<item name="android:windowElevation" tools:ignore="NewApi">@dimen/m3_alert_dialog_elevation</item>
<item name="android:checkedTextViewStyle" tools:ignore="NewApi">@style/Widget.Material3.CheckedTextView</item>
<item name="android:windowElevation">@dimen/m3_alert_dialog_elevation</item>
<item name="android:checkedTextViewStyle">@style/Widget.Material3.CheckedTextView</item>
<item name="buttonBarButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog</item>
<item name="buttonBarPositiveButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog</item>
<item name="buttonBarNegativeButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog</item>

32
lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml
View File

@ -62,17 +62,11 @@
<item name="android:minWidth">@dimen/mtrl_extended_fab_min_width</item>
<item name="android:paddingTop">@dimen/mtrl_extended_fab_top_padding</item>
<item name="android:paddingBottom">@dimen/mtrl_extended_fab_bottom_padding</item>
<item name="android:paddingStart" tools:ignore="NewApi">
@dimen/mtrl_extended_fab_start_padding
</item>
<item name="android:paddingEnd" tools:ignore="NewApi">
@dimen/mtrl_extended_fab_end_padding
</item>
<item name="android:paddingStart">@dimen/mtrl_extended_fab_start_padding</item>
<item name="android:paddingEnd">@dimen/mtrl_extended_fab_end_padding</item>
<item name="android:paddingLeft">@dimen/mtrl_extended_fab_start_padding</item>
<item name="android:paddingRight">@dimen/mtrl_extended_fab_end_padding</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/mtrl_extended_fab_state_list_animator
</item>
<item name="android:stateListAnimator">@animator/mtrl_extended_fab_state_list_animator</item>
<item name="android:textColor">@color/mtrl_fab_icon_text_color_selector</item>
<item name="backgroundTint">@color/mtrl_fab_bg_color_selector</item>
<item name="elevation">@dimen/mtrl_extended_fab_elevation</item>
@ -93,12 +87,8 @@
<style name="Widget.MaterialComponents.ExtendedFloatingActionButton.Icon" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
<item name="android:gravity">start|center_vertical</item>
<item name="android:paddingStart" tools:ignore="NewApi">
@dimen/mtrl_extended_fab_start_padding_icon
</item>
<item name="android:paddingEnd" tools:ignore="NewApi">
@dimen/mtrl_extended_fab_end_padding_icon
</item>
<item name="android:paddingStart">@dimen/mtrl_extended_fab_start_padding_icon</item>
<item name="android:paddingEnd">@dimen/mtrl_extended_fab_end_padding_icon</item>
<item name="android:paddingLeft">@dimen/mtrl_extended_fab_start_padding_icon</item>
<item name="android:paddingRight">@dimen/mtrl_extended_fab_end_padding_icon</item>
</style>
@ -229,9 +219,7 @@
<item name="rippleColor">@color/m3_efab_ripple_color_selector</item>
<item name="android:minHeight">@dimen/m3_comp_extended_fab_primary_container_height</item>
<item name="elevation">@dimen/m3_comp_extended_fab_primary_container_elevation</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_extended_fab_state_list_animator
</item>
<item name="android:stateListAnimator">@animator/m3_extended_fab_state_list_animator</item>
<item name="iconSize">@dimen/m3_comp_extended_fab_primary_icon_size</item>
<item name="android:textAppearance">@macro/m3_comp_extended_fab_primary_label_text_type</item>
<item name="shapeAppearance">@macro/m3_comp_extended_fab_primary_container_shape</item>
@ -262,14 +250,10 @@
<!-- M3 Icon Extended FABs -->
<style name="Base.Widget.Material3.ExtendedFloatingActionButton.Icon" parent="Base.Widget.Material3.ExtendedFloatingActionButton">
<item name="android:paddingStart" tools:ignore="NewApi">
@dimen/m3_extended_fab_start_padding
</item>
<item name="android:paddingStart">@dimen/m3_extended_fab_start_padding</item>
<item name="android:paddingLeft">@dimen/m3_extended_fab_start_padding</item>
<item name="android:paddingTop">@dimen/m3_extended_fab_top_padding</item>
<item name="android:paddingEnd" tools:ignore="NewApi">
@dimen/m3_extended_fab_end_padding
</item>
<item name="android:paddingEnd">@dimen/m3_extended_fab_end_padding</item>
<item name="android:paddingRight">@dimen/m3_extended_fab_end_padding</item>
<item name="android:paddingBottom">@dimen/m3_extended_fab_bottom_padding</item>
<item name="iconPadding">@dimen/m3_extended_fab_icon_padding</item>

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

@ -56,22 +56,22 @@
<!-- Styles for M3 Overflow Menus -->
<style name="Widget.Material3.PopupMenu.Overflow" parent="Widget.MaterialComponents.PopupMenu.Overflow">
<item name="android:popupElevation" tools:ignore="NewApi">@dimen/m3_menu_elevation</item>
<item name="android:popupElevation">@dimen/m3_menu_elevation</item>
</style>
<!-- Styles for M3 Popup Menus -->
<style name="Widget.Material3.PopupMenu" parent="Widget.MaterialComponents.PopupMenu">
<item name="android:popupElevation" tools:ignore="NewApi">@dimen/m3_menu_elevation</item>
<item name="android:popupElevation">@dimen/m3_menu_elevation</item>
</style>
<!-- Styles for M3 List Popup Window Menus -->
<style name="Widget.Material3.PopupMenu.ListPopupWindow" parent="Widget.MaterialComponents.PopupMenu.ListPopupWindow">
<item name="android:popupElevation" tools:ignore="NewApi">@dimen/m3_menu_elevation</item>
<item name="android:popupElevation">@dimen/m3_menu_elevation</item>
</style>
<!-- Styles for M3 Context Menus -->
<style name="Widget.Material3.PopupMenu.ContextMenu" parent="Widget.MaterialComponents.PopupMenu.ContextMenu">
<item name="android:popupElevation" tools:ignore="NewApi">@dimen/m3_menu_elevation</item>
<item name="android:popupElevation">@dimen/m3_menu_elevation</item>
</style>
</resources>

6
lib/java/com/google/android/material/search/res/values/styles.xml
View File

@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi">
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Widget.Material3.SearchBar" parent="android:Widget">
<item name="backgroundTint">@macro/m3_comp_search_bar_container_color</item>
@ -32,8 +32,8 @@
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Search</item>
<!-- On newer API levels, hide shadows while keeping elevation. -->
<item name="android:outlineAmbientShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
<item name="android:outlineSpotShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
<item name="android:outlineAmbientShadowColor" tools:targetApi="p">@android:color/transparent</item>
<item name="android:outlineSpotShadowColor" tools:targetApi="p">@android:color/transparent</item>
</style>
<style name="Widget.Material3.SearchBar.Outlined">

4
lib/java/com/google/android/material/sidesheet/res/values/styles.xml
View File

@ -25,7 +25,7 @@
needs to be explicitly set on the behavior's associated View in the
layout. -->
<item name="android:layout_gravity">end</item>
<item name="android:elevation" tools:ignore="NewApi">@dimen/m3_side_sheet_standard_elevation</item>
<item name="android:elevation">@dimen/m3_side_sheet_standard_elevation</item>
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.Sheet.Side.Docked.Container.Shape</item>
</style>
@ -45,7 +45,7 @@
explicitly on the modal side sheet View. -->
<item name="android:layout_width">@dimen/m3_side_sheet_width</item>
<item name="android:layout_height">match_parent</item>
<item name="android:elevation" tools:ignore="NewApi">@dimen/m3_side_sheet_modal_elevation</item>
<item name="android:elevation">@dimen/m3_side_sheet_modal_elevation</item>
<item name="backgroundTint">@macro/m3_comp_sheet_side_docked_modal_container_color</item>
<item name="shapeAppearance">@macro/m3_comp_sheet_side_docked_modal_container_shape</item>
</style>

2
lib/java/com/google/android/material/snackbar/res/values/styles.xml
View File

@ -57,7 +57,7 @@
<item name="android:alpha">@dimen/material_emphasis_high_type</item>
<item name="android:ellipsize">end</item>
<item name="android:maxLines">@integer/design_snackbar_text_max_lines</item>
<item name="android:textAlignment" tools:ignore="NewApi">viewStart</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">?attr/textAppearanceBody2</item>
<item name="android:textColor">?attr/colorSurface</item>
<item name="android:paddingTop">@dimen/design_snackbar_padding_vertical</item>

2
lib/java/com/google/android/material/textfield/res/values-v23/styles.xml
View File

@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi">
<resources xmlns:tools="http://schemas.android.com/tools">
<!--
ThemeOverlay to be used internally for API >= 23 in the TextInputLayout M3 box styles.
Color state lists with theme color references are currently only supported in API >= 23

18
lib/java/com/google/android/material/textfield/res/values/styles.xml
View File

@ -172,8 +172,8 @@
<item name="enforceMaterialTheme">true</item>
<item name="enforceTextAppearance">true</item>
<item name="android:background">@null</item>
<item name="android:paddingStart" tools:ignore="NewApi">16dp</item>
<item name="android:paddingEnd" tools:ignore="NewApi">16dp</item>
<item name="android:paddingStart">16dp</item>
<item name="android:paddingEnd">16dp</item>
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<!-- Edit text's default text size is 16sp which currently equals to 22dp total line height, so
@ -208,8 +208,8 @@
<item name="enforceMaterialTheme">true</item>
<item name="enforceTextAppearance">true</item>
<item name="android:background">@null</item>
<item name="android:paddingStart" tools:ignore="NewApi">16dp</item>
<item name="android:paddingEnd" tools:ignore="NewApi">16dp</item>
<item name="android:paddingStart">16dp</item>
<item name="android:paddingEnd">16dp</item>
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<!-- Edit text's default text size is 16sp which currently equals to 22dp total line height, so
@ -218,7 +218,7 @@
<item name="android:paddingBottom">17dp</item>
<item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
<item name="android:dropDownVerticalOffset">@dimen/mtrl_exposed_dropdown_menu_popup_vertical_offset</item>
<item name="android:popupElevation" tools:ignore="NewApi">@dimen/mtrl_exposed_dropdown_menu_popup_elevation</item>
<item name="android:popupElevation">@dimen/mtrl_exposed_dropdown_menu_popup_elevation</item>
</style>
<style name="Base.Widget.MaterialComponents.AutoCompleteTextView" parent="Base.V14.Widget.MaterialComponents.AutoCompleteTextView">
@ -466,7 +466,7 @@
<item name="simpleItemSelectedRippleColor">@color/m3_simple_item_ripple_color</item>
<item name="simpleItemLayout">@layout/m3_auto_complete_simple_item</item>
<item name="dropDownBackgroundTint">@macro/m3_comp_outlined_autocomplete_menu_container_color</item>
<item name="android:popupElevation" tools:ignore="NewApi">@dimen/m3_comp_outlined_autocomplete_menu_container_elevation</item>
<item name="android:popupElevation">@dimen/m3_comp_outlined_autocomplete_menu_container_elevation</item>
</style>
<style name="Widget.Material3.AutoCompleteTextView.OutlinedBox.Dense" parent="Widget.MaterialComponents.AutoCompleteTextView.OutlinedBox.Dense">
@ -475,7 +475,7 @@
<item name="simpleItemSelectedRippleColor">@color/m3_simple_item_ripple_color</item>
<item name="simpleItemLayout">@layout/m3_auto_complete_simple_item</item>
<item name="dropDownBackgroundTint">@macro/m3_comp_outlined_autocomplete_menu_container_color</item>
<item name="android:popupElevation" tools:ignore="NewApi">@dimen/m3_comp_outlined_autocomplete_menu_container_elevation</item>
<item name="android:popupElevation">@dimen/m3_comp_outlined_autocomplete_menu_container_elevation</item>
</style>
<style name="Widget.Material3.AutoCompleteTextView.FilledBox" parent="Widget.MaterialComponents.AutoCompleteTextView.FilledBox">
@ -484,7 +484,7 @@
<item name="simpleItemSelectedRippleColor">@color/m3_simple_item_ripple_color</item>
<item name="simpleItemLayout">@layout/m3_auto_complete_simple_item</item>
<item name="dropDownBackgroundTint">@macro/m3_comp_filled_autocomplete_menu_container_color</item>
<item name="android:popupElevation" tools:ignore="NewApi">@dimen/m3_comp_filled_autocomplete_menu_container_elevation</item>
<item name="android:popupElevation">@dimen/m3_comp_filled_autocomplete_menu_container_elevation</item>
</style>
<style name="Widget.Material3.AutoCompleteTextView.FilledBox.Dense" parent="Widget.MaterialComponents.AutoCompleteTextView.FilledBox.Dense">
@ -493,7 +493,7 @@
<item name="simpleItemSelectedRippleColor">@color/m3_simple_item_ripple_color</item>
<item name="simpleItemLayout">@layout/m3_auto_complete_simple_item</item>
<item name="dropDownBackgroundTint">@macro/m3_comp_filled_autocomplete_menu_container_color</item>
<item name="android:popupElevation" tools:ignore="NewApi">@dimen/m3_comp_filled_autocomplete_menu_container_elevation</item>
<item name="android:popupElevation">@dimen/m3_comp_filled_autocomplete_menu_container_elevation</item>
</style>
<!-- ThemeOverlays to be used internally in the TextInputLayout styles to automatically apply the correct TextInputEditText style to the TextInputEditText. -->

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

@ -248,7 +248,7 @@
<!-- Default Framework Text styles. -->
<item name="android:textAppearanceListItem">?attr/textAppearanceTitleMedium</item>
<item name="android:textAppearanceListItemSmall">?attr/textAppearanceTitleMedium</item>
<item name="android:textAppearanceListItemSecondary" >?attr/textAppearanceBodyMedium</item>
<item name="android:textAppearanceListItemSecondary">?attr/textAppearanceBodyMedium</item>
<item name="textAppearanceListItem">?attr/textAppearanceTitleMedium</item>
<item name="textAppearanceListItemSmall">?attr/textAppearanceTitleMedium</item>
<item name="textAppearanceListItemSecondary">?attr/textAppearanceBodyMedium</item>
@ -538,7 +538,7 @@
<!-- Default Framework Text styles. -->
<item name="android:textAppearanceListItem">?attr/textAppearanceTitleMedium</item>
<item name="android:textAppearanceListItemSmall">?attr/textAppearanceTitleMedium</item>
<item name="android:textAppearanceListItemSecondary" >?attr/textAppearanceBodyMedium</item>
<item name="android:textAppearanceListItemSecondary">?attr/textAppearanceBodyMedium</item>
<item name="textAppearanceListItem">?attr/textAppearanceTitleMedium</item>
<item name="textAppearanceListItemSmall">?attr/textAppearanceTitleMedium</item>
<item name="textAppearanceListItemSecondary">?attr/textAppearanceBodyMedium</item>
@ -656,8 +656,8 @@
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.MaterialComponents.BottomSheetDialog</item>
<item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
<item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
<item name="android:datePickerDialogTheme" tools:ignore="NewApi">@style/ThemeOverlay.MaterialComponents.Dialog</item>
<item name="android:timePickerDialogTheme" tools:ignore="NewApi">@style/ThemeOverlay.MaterialComponents.Dialog</item>
<item name="android:datePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog</item>
<item name="android:timePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog</item>
<!-- Type styles -->
<item name="textAppearanceLargePopupMenu">?attr/textAppearanceSubtitle1</item>
@ -723,8 +723,8 @@
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.MaterialComponents.BottomSheetDialog</item>
<item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
<item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
<item name="android:datePickerDialogTheme" tools:ignore="NewApi">@style/ThemeOverlay.MaterialComponents.Dialog</item>
<item name="android:timePickerDialogTheme" tools:ignore="NewApi">@style/ThemeOverlay.MaterialComponents.Dialog</item>
<item name="android:datePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog</item>
<item name="android:timePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog</item>
<!-- Type styles -->
<item name="textAppearanceLargePopupMenu">?attr/textAppearanceSubtitle1</item>

2
lib/java/com/google/android/material/timepicker/res/values/themes.xml
View File

@ -29,7 +29,7 @@
</style>
<style name="ThemeOverlay.Material3.MaterialTimePicker" parent="ThemeOverlay.Material3.Dialog">
<item name="android:windowElevation" tools:ignore="NewApi">@dimen/m3_timepicker_window_elevation</item>
<item name="android:windowElevation">@dimen/m3_timepicker_window_elevation</item>
<item name="chipStyle">@style/Widget.Material3.MaterialTimePicker.Display</item>
<item name="textInputStyle">@style/Widget.Material3.MaterialTimePicker.Display.TextInputLayout</item>
<item name="materialDisplayDividerStyle">@style/Widget.Material3.MaterialTimePicker.Display.Divider</item>

32
lib/java/com/google/android/material/typography/res/values/styles.xml
View File

@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi">
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="TextAppearance.Material3.DisplayLarge" parent="TextAppearance.M3.Sys.Typescale.DisplayLarge"/>
<style name="TextAppearance.Material3.DisplayMedium" parent="TextAppearance.M3.Sys.Typescale.DisplayMedium"/>
@ -54,7 +54,7 @@
<item name="android:textSize">57sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">64sp</item>
<item name="android:lineHeight">64sp</item>
<item name="android:lineHeight" tools:targetApi="p">64sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.DisplayMedium.Emphasized" parent="TextAppearance.AppCompat.Display2">
@ -63,7 +63,7 @@
<item name="android:textSize">45sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">52sp</item>
<item name="android:lineHeight">52sp</item>
<item name="android:lineHeight" tools:targetApi="p">52sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.DisplaySmall.Emphasized" parent="TextAppearance.AppCompat.Display1">
@ -72,7 +72,7 @@
<item name="android:textSize">36sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">44sp</item>
<item name="android:lineHeight">44sp</item>
<item name="android:lineHeight" tools:targetApi="p">44sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.HeadlineLarge.Emphasized" parent="TextAppearance.AppCompat.Display1">
@ -81,7 +81,7 @@
<item name="android:textSize">32sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">40sp</item>
<item name="android:lineHeight">40sp</item>
<item name="android:lineHeight" tools:targetApi="p">40sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.HeadlineMedium.Emphasized" parent="TextAppearance.AppCompat.Headline">
@ -90,7 +90,7 @@
<item name="android:textSize">28sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">36sp</item>
<item name="android:lineHeight">36sp</item>
<item name="android:lineHeight" tools:targetApi="p">36sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.HeadlineSmall.Emphasized" parent="TextAppearance.AppCompat.Title">
@ -99,7 +99,7 @@
<item name="android:textSize">24sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">32sp</item>
<item name="android:lineHeight">32sp</item>
<item name="android:lineHeight" tools:targetApi="p">32sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.TitleLarge.Emphasized" parent="TextAppearance.AppCompat.Title">
@ -108,7 +108,7 @@
<item name="android:textSize">22sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">28sp</item>
<item name="android:lineHeight">28sp</item>
<item name="android:lineHeight" tools:targetApi="p">28sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.TitleMedium.Emphasized" parent="TextAppearance.AppCompat.Subhead">
@ -118,7 +118,7 @@
<item name="android:textSize">16sp</item>
<item name="android:letterSpacing">0.009375</item>
<item name="lineHeight">24sp</item>
<item name="android:lineHeight">24sp</item>
<item name="android:lineHeight" tools:targetApi="p">24sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.TitleSmall.Emphasized" parent="TextAppearance.AppCompat.Subhead">
@ -128,7 +128,7 @@
<item name="android:textSize">14sp</item>
<item name="android:letterSpacing">0.00714286</item>
<item name="lineHeight">20sp</item>
<item name="android:lineHeight">20sp</item>
<item name="android:lineHeight" tools:targetApi="p">20sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.BodyLarge.Emphasized" parent="TextAppearance.AppCompat.Body2">
@ -138,7 +138,7 @@
<item name="android:textSize">16sp</item>
<item name="android:letterSpacing">0.009375</item>
<item name="lineHeight">24sp</item>
<item name="android:lineHeight">24sp</item>
<item name="android:lineHeight" tools:targetApi="p">24sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.BodyMedium.Emphasized" parent="TextAppearance.AppCompat.Body1">
@ -148,7 +148,7 @@
<item name="android:textSize">14sp</item>
<item name="android:letterSpacing">0.01785714</item>
<item name="lineHeight">20sp</item>
<item name="android:lineHeight">20sp</item>
<item name="android:lineHeight" tools:targetApi="p">20sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.BodySmall.Emphasized" parent="TextAppearance.AppCompat.Caption">
@ -158,7 +158,7 @@
<item name="android:textSize">12sp</item>
<item name="android:letterSpacing">0.03333333</item>
<item name="lineHeight">16sp</item>
<item name="android:lineHeight">16sp</item>
<item name="android:lineHeight" tools:targetApi="p">16sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.LabelLarge.Emphasized" parent="TextAppearance.AppCompat.Body1">
@ -168,7 +168,7 @@
<item name="android:textSize">14sp</item>
<item name="android:letterSpacing">0.00714286</item>
<item name="lineHeight">20sp</item>
<item name="android:lineHeight">20sp</item>
<item name="android:lineHeight" tools:targetApi="p">20sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.LabelMedium.Emphasized" parent="TextAppearance.AppCompat.Caption">
@ -178,7 +178,7 @@
<item name="android:textSize">12sp</item>
<item name="android:letterSpacing">0.04166667</item>
<item name="lineHeight">16sp</item>
<item name="android:lineHeight">16sp</item>
<item name="android:lineHeight" tools:targetApi="p">16sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="TextAppearance.M3.Sys.Typescale.LabelSmall.Emphasized" parent="TextAppearance.AppCompat.Caption">
@ -188,7 +188,7 @@
<item name="android:textSize">11sp</item>
<item name="android:letterSpacing">0.04545455</item>
<item name="lineHeight">16sp</item>
<item name="android:lineHeight">16sp</item>
<item name="android:lineHeight" tools:targetApi="p">16sp</item>
<item name="android:textAllCaps">false</item>
</style>

6
lib/javatests/com/google/android/material/theme/res/values/styles.xml
View File

@ -15,14 +15,14 @@
~ limitations under the License.
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<style name="ThemeOverlayColorAccentRed" tools:ignore="NewApi">
<style name="ThemeOverlayColorAccentRed">
<item name="android:colorAccent">#FFFF0000</item>
</style>
<style name="AndroidThemeColorAccentYellow" tools:ignore="NewApi">
<style name="AndroidThemeColorAccentYellow">
<item name="android:colorAccent">#FFFFFF00</item>
</style>