Skip to content

Remove Expressive from future 1.13 releases, so we can get 1.13 to stable faster #4803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2025
Merged

Remove Expressive from future 1.13 releases, so we can get 1.13 to stable faster #4803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/application/theme/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- For the catalog we know that toolbars will always be on top of a "surface" color,
so it's better for them to have no background, especially because it's common for
toolbars to be nested in an AppBarLayout which has its own background handling. -->
<style name="Widget.Catalog.Toolbar" parent="Widget.Material3Expressive.Toolbar.OnSurface" />
<style name="Widget.Catalog.Toolbar" parent="Widget.Material3.Toolbar.OnSurface" />

<style name="Widget.Catalog.Toolbar.WithCloseButton">
<item name="navigationContentDescription">@string/toolbar_navigation_close_description</item>
Expand Down
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/application/theme/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->
<resources xmlns:tools="http://schemas.android.com/tools">

<style name="Theme.Catalog" parent="Theme.Material3Expressive.DayNight.NoActionBar">
<style name="Theme.Catalog" parent="Theme.Material3.DayNight.NoActionBar">
<item name="preferenceTheme">@style/CatalogPreferenceThemeOverlay</item>
<item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
<item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
Expand Down
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/dialog/DialogMainDemoFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ public void onClick(DialogInterface dialog, int which) {

@StyleRes
protected int getCenteredTitleThemeOverlay() {
return com.google.android.material.R.style.ThemeOverlay_Material3Expressive_MaterialAlertDialog_Centered;
return com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered;
}

@StyleRes
Expand Down
6 changes: 3 additions & 3 deletions catalog/java/io/material/catalog/dialog/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@

<resources xmlns:tools="http://schemas.android.com/tools">

<style name="Widget.Catalog.Button.TextButton.Dialog.FullWidth" parent="Widget.Material3Expressive.Button.TextButton.Dialog">
<style name="Widget.Catalog.Button.TextButton.Dialog.FullWidth" parent="Widget.Material3.Button.TextButton.Dialog">
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:maxWidth">@null</item>
</style>

<!-- A theme overlay for dialogs with buttons that span the width of the dialog. -->
<style name="ThemeOverlay.Catalog.MaterialAlertDialog.FullWidthButtons" parent="ThemeOverlay.Material3Expressive.MaterialAlertDialog">
<style name="ThemeOverlay.Catalog.MaterialAlertDialog.FullWidthButtons" parent="ThemeOverlay.Material3.MaterialAlertDialog">
<item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_gone</item>
<item name="buttonBarPositiveButtonStyle">@style/Widget.Catalog.Button.TextButton.Dialog.FullWidth</item>
<item name="buttonBarNegativeButtonStyle">@style/Widget.Catalog.Button.TextButton.Dialog.FullWidth</item>
<item name="buttonBarNeutralButtonStyle">@style/Widget.Catalog.Button.TextButton.Dialog.FullWidth</item>
</style>

<!-- A theme overlay for dialogs with a center aligned title text, icon and buttons that span the width of the dialog. -->
<style name="ThemeOverlay.Catalog.MaterialAlertDialog.Centered.FullWidthButtons" parent="ThemeOverlay.Material3Expressive.MaterialAlertDialog.Centered">
<style name="ThemeOverlay.Catalog.MaterialAlertDialog.Centered.FullWidthButtons" parent="ThemeOverlay.Material3.MaterialAlertDialog.Centered">
<!-- Mark spacer as gone when showing full width buttons -->
<item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_gone</item>
<item name="buttonBarPositiveButtonStyle">@style/Widget.Catalog.Button.TextButton.Dialog.FullWidth</item>
Expand Down
1 change: 0 additions & 1 deletion ...og/java/io/material/catalog/dockedtoolbar/res/layout/cat_docked_toolbar_small_content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
style="?attr/materialIconButtonFilledStyle"
app:materialSizeOverlay="@style/SizeOverlay.Material3Expressive.Button.IconButton.Small.Square"
android:contentDescription="@string/cat_docked_toolbar_add_button_description"
app:icon="@drawable/ic_add_24px" />
</FrameLayout>
Expand Down
189 changes: 9 additions & 180 deletions catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
android:layout_gravity="center"
android:contentDescription="@string/m3_primary_small_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
Expand All @@ -63,7 +63,7 @@
android:layout_gravity="center"
android:contentDescription="@string/m3_primary_medium_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
Expand All @@ -79,7 +79,7 @@
android:layout_gravity="center"
android:contentDescription="@string/m3_primary_large_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
app:icon="@drawable/ic_add_24px" />

<TextView
Expand All @@ -104,7 +104,7 @@
android:layout_gravity="center"
android:contentDescription="@string/m3_secondary_small_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
Expand All @@ -120,7 +120,7 @@
android:layout_gravity="center"
android:contentDescription="@string/m3_secondary_medium_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
Expand All @@ -136,7 +136,7 @@
android:layout_gravity="center"
android:contentDescription="@string/m3_secondary_large_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
app:icon="@drawable/ic_add_24px" />

<TextView
Expand All @@ -161,7 +161,7 @@
android:layout_gravity="center"
android:contentDescription="@string/m3_tertiary_small_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
Expand All @@ -177,7 +177,7 @@
android:layout_gravity="center"
android:contentDescription="@string/m3_tertiary_medium_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
Expand All @@ -193,178 +193,7 @@
android:layout_gravity="center"
android:contentDescription="@string/m3_tertiary_large_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
app:icon="@drawable/ic_add_24px" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:layout_columnSpan="2"
android:textAppearance="?attr/textAppearanceTitleLarge"
android:text="@string/m3_primary_container_extended_fab_label" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
android:text="@string/m3_small_extended_fab_label"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="?attr/extendedFloatingActionButtonSmallStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center"
android:contentDescription="@string/m3_primary_container_small_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
android:text="@string/m3_medium_extended_fab_label"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="?attr/extendedFloatingActionButtonMediumStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center"
android:contentDescription="@string/m3_primary_container_medium_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
android:text="@string/m3_large_extended_fab_label"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="?attr/extendedFloatingActionButtonLargeStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center"
android:contentDescription="@string/m3_primary_container_large_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
app:icon="@drawable/ic_add_24px" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:layout_columnSpan="2"
android:textAppearance="?attr/textAppearanceTitleLarge"
android:text="@string/m3_secondary_container_extended_fab_label" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
android:text="@string/m3_small_extended_fab_label"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="?attr/extendedFloatingActionButtonSmallStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center"
android:contentDescription="@string/m3_secondary_container_small_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
android:text="@string/m3_medium_extended_fab_label"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="?attr/extendedFloatingActionButtonMediumStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center"
android:contentDescription="@string/m3_secondary_container_medium_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
android:text="@string/m3_large_extended_fab_label"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="?attr/extendedFloatingActionButtonLargeStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center"
android:contentDescription="@string/m3_secondary_container_large_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
app:icon="@drawable/ic_add_24px" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:layout_columnSpan="2"
android:textAppearance="?attr/textAppearanceTitleLarge"
android:text="@string/m3_tertiary_container_extended_fab_label" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
android:text="@string/m3_small_extended_fab_label"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="?attr/extendedFloatingActionButtonSmallStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center"
android:contentDescription="@string/m3_tertiary_container_small_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
android:text="@string/m3_medium_extended_fab_label"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="?attr/extendedFloatingActionButtonMediumStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center"
android:contentDescription="@string/m3_tertiary_container_medium_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
app:icon="@drawable/ic_add_24px" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
android:text="@string/m3_large_extended_fab_label"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="?attr/extendedFloatingActionButtonLargeStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center"
android:contentDescription="@string/m3_tertiary_container_large_extended_fab_content_desc"
android:text="@string/extended_fab_label"
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
app:icon="@drawable/ic_add_24px" />

</GridLayout>
Loading