Skip to content

Commit 27226d6

Browse files
dsn5ftdsn5ft
authored
Remove Expressive from 1.13 releases, so we can get 1.13 to stable faster (#4803)
1 parent 13cdaba commit 27226d6

File tree

42 files changed

+34
-1956
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+34
-1956
lines changed

‎catalog/java/io/material/catalog/application/theme/res/values/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<!-- For the catalog we know that toolbars will always be on top of a "surface" color,
2020
so it's better for them to have no background, especially because it's common for
2121
toolbars to be nested in an AppBarLayout which has its own background handling. -->
22-
<style name="Widget.Catalog.Toolbar" parent="Widget.Material3Expressive.Toolbar.OnSurface" />
22+
<style name="Widget.Catalog.Toolbar" parent="Widget.Material3.Toolbar.OnSurface" />
2323

2424
<style name="Widget.Catalog.Toolbar.WithCloseButton">
2525
<item name="navigationContentDescription">@string/toolbar_navigation_close_description</item>

‎catalog/java/io/material/catalog/application/theme/res/values/themes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
-->
1717
<resources xmlns:tools="http://schemas.android.com/tools">
1818

19-
<style name="Theme.Catalog" parent="Theme.Material3Expressive.DayNight.NoActionBar">
19+
<style name="Theme.Catalog" parent="Theme.Material3.DayNight.NoActionBar">
2020
<item name="preferenceTheme">@style/CatalogPreferenceThemeOverlay</item>
2121
<item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
2222
<item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>

‎catalog/java/io/material/catalog/dialog/DialogMainDemoFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public void onClick(DialogInterface dialog, int which) {
309309

310310
@StyleRes
311311
protected int getCenteredTitleThemeOverlay() {
312-
return com.google.android.material.R.style.ThemeOverlay_Material3Expressive_MaterialAlertDialog_Centered;
312+
return com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered;
313313
}
314314

315315
@StyleRes

‎catalog/java/io/material/catalog/dialog/res/values/styles.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717

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

20-
<style name="Widget.Catalog.Button.TextButton.Dialog.FullWidth" parent="Widget.Material3Expressive.Button.TextButton.Dialog">
20+
<style name="Widget.Catalog.Button.TextButton.Dialog.FullWidth" parent="Widget.Material3.Button.TextButton.Dialog">
2121
<item name="android:layout_width">0dp</item>
2222
<item name="android:layout_weight">1</item>
2323
<item name="android:maxWidth">@null</item>
2424
</style>
2525

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

3434
<!-- A theme overlay for dialogs with a center aligned title text, icon and buttons that span the width of the dialog. -->
35-
<style name="ThemeOverlay.Catalog.MaterialAlertDialog.Centered.FullWidthButtons" parent="ThemeOverlay.Material3Expressive.MaterialAlertDialog.Centered">
35+
<style name="ThemeOverlay.Catalog.MaterialAlertDialog.Centered.FullWidthButtons" parent="ThemeOverlay.Material3.MaterialAlertDialog.Centered">
3636
<!-- Mark spacer as gone when showing full width buttons -->
3737
<item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_gone</item>
3838
<item name="buttonBarPositiveButtonStyle">@style/Widget.Catalog.Button.TextButton.Dialog.FullWidth</item>

‎catalog/java/io/material/catalog/dockedtoolbar/res/layout/cat_docked_toolbar_small_content.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
android:layout_height="wrap_content"
4646
android:layout_gravity="center"
4747
style="?attr/materialIconButtonFilledStyle"
48-
app:materialSizeOverlay="@style/SizeOverlay.Material3Expressive.Button.IconButton.Small.Square"
4948
android:contentDescription="@string/cat_docked_toolbar_add_button_description"
5049
app:icon="@drawable/ic_add_24px" />
5150
</FrameLayout>

‎catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml‎

Lines changed: 9 additions & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
android:layout_gravity="center"
4848
android:contentDescription="@string/m3_primary_small_extended_fab_content_desc"
4949
android:text="@string/extended_fab_label"
50-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
50+
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
5151
app:icon="@drawable/ic_add_24px" />
5252
<TextView
5353
android:layout_width="wrap_content"
@@ -63,7 +63,7 @@
6363
android:layout_gravity="center"
6464
android:contentDescription="@string/m3_primary_medium_extended_fab_content_desc"
6565
android:text="@string/extended_fab_label"
66-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
66+
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
6767
app:icon="@drawable/ic_add_24px" />
6868
<TextView
6969
android:layout_width="wrap_content"
@@ -79,7 +79,7 @@
7979
android:layout_gravity="center"
8080
android:contentDescription="@string/m3_primary_large_extended_fab_content_desc"
8181
android:text="@string/extended_fab_label"
82-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
82+
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
8383
app:icon="@drawable/ic_add_24px" />
8484

8585
<TextView
@@ -104,7 +104,7 @@
104104
android:layout_gravity="center"
105105
android:contentDescription="@string/m3_secondary_small_extended_fab_content_desc"
106106
android:text="@string/extended_fab_label"
107-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
107+
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
108108
app:icon="@drawable/ic_add_24px" />
109109
<TextView
110110
android:layout_width="wrap_content"
@@ -120,7 +120,7 @@
120120
android:layout_gravity="center"
121121
android:contentDescription="@string/m3_secondary_medium_extended_fab_content_desc"
122122
android:text="@string/extended_fab_label"
123-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
123+
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
124124
app:icon="@drawable/ic_add_24px" />
125125
<TextView
126126
android:layout_width="wrap_content"
@@ -136,7 +136,7 @@
136136
android:layout_gravity="center"
137137
android:contentDescription="@string/m3_secondary_large_extended_fab_content_desc"
138138
android:text="@string/extended_fab_label"
139-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
139+
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
140140
app:icon="@drawable/ic_add_24px" />
141141

142142
<TextView
@@ -161,7 +161,7 @@
161161
android:layout_gravity="center"
162162
android:contentDescription="@string/m3_tertiary_small_extended_fab_content_desc"
163163
android:text="@string/extended_fab_label"
164-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
164+
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
165165
app:icon="@drawable/ic_add_24px" />
166166
<TextView
167167
android:layout_width="wrap_content"
@@ -177,7 +177,7 @@
177177
android:layout_gravity="center"
178178
android:contentDescription="@string/m3_tertiary_medium_extended_fab_content_desc"
179179
android:text="@string/extended_fab_label"
180-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
180+
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
181181
app:icon="@drawable/ic_add_24px" />
182182
<TextView
183183
android:layout_width="wrap_content"
@@ -193,178 +193,7 @@
193193
android:layout_gravity="center"
194194
android:contentDescription="@string/m3_tertiary_large_extended_fab_content_desc"
195195
android:text="@string/extended_fab_label"
196-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
197-
app:icon="@drawable/ic_add_24px" />
198-
199-
<TextView
200-
android:layout_width="wrap_content"
201-
android:layout_height="wrap_content"
202-
android:layout_gravity="start|center"
203-
android:layout_columnSpan="2"
204-
android:textAppearance="?attr/textAppearanceTitleLarge"
205-
android:text="@string/m3_primary_container_extended_fab_label" />
206-
207-
<TextView
208-
android:layout_width="wrap_content"
209-
android:layout_height="wrap_content"
210-
android:layout_marginRight="24dp"
211-
android:layout_gravity="start|center"
212-
android:text="@string/m3_small_extended_fab_label"/>
213-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
214-
style="?attr/extendedFloatingActionButtonSmallStyle"
215-
android:layout_width="wrap_content"
216-
android:layout_height="wrap_content"
217-
android:layout_margin="8dp"
218-
android:layout_gravity="center"
219-
android:contentDescription="@string/m3_primary_container_small_extended_fab_content_desc"
220-
android:text="@string/extended_fab_label"
221-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
222-
app:icon="@drawable/ic_add_24px" />
223-
<TextView
224-
android:layout_width="wrap_content"
225-
android:layout_height="wrap_content"
226-
android:layout_marginRight="24dp"
227-
android:layout_gravity="start|center"
228-
android:text="@string/m3_medium_extended_fab_label"/>
229-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
230-
style="?attr/extendedFloatingActionButtonMediumStyle"
231-
android:layout_width="wrap_content"
232-
android:layout_height="wrap_content"
233-
android:layout_margin="8dp"
234-
android:layout_gravity="center"
235-
android:contentDescription="@string/m3_primary_container_medium_extended_fab_content_desc"
236-
android:text="@string/extended_fab_label"
237-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
238-
app:icon="@drawable/ic_add_24px" />
239-
<TextView
240-
android:layout_width="wrap_content"
241-
android:layout_height="wrap_content"
242-
android:layout_marginRight="24dp"
243-
android:layout_gravity="start|center"
244-
android:text="@string/m3_large_extended_fab_label"/>
245-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
246-
style="?attr/extendedFloatingActionButtonLargeStyle"
247-
android:layout_width="wrap_content"
248-
android:layout_height="wrap_content"
249-
android:layout_margin="8dp"
250-
android:layout_gravity="center"
251-
android:contentDescription="@string/m3_primary_container_large_extended_fab_content_desc"
252-
android:text="@string/extended_fab_label"
253-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
254-
app:icon="@drawable/ic_add_24px" />
255-
256-
<TextView
257-
android:layout_width="wrap_content"
258-
android:layout_height="wrap_content"
259-
android:layout_gravity="start|center"
260-
android:layout_columnSpan="2"
261-
android:textAppearance="?attr/textAppearanceTitleLarge"
262-
android:text="@string/m3_secondary_container_extended_fab_label" />
263-
264-
<TextView
265-
android:layout_width="wrap_content"
266-
android:layout_height="wrap_content"
267-
android:layout_marginRight="24dp"
268-
android:layout_gravity="start|center"
269-
android:text="@string/m3_small_extended_fab_label"/>
270-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
271-
style="?attr/extendedFloatingActionButtonSmallStyle"
272-
android:layout_width="wrap_content"
273-
android:layout_height="wrap_content"
274-
android:layout_margin="8dp"
275-
android:layout_gravity="center"
276-
android:contentDescription="@string/m3_secondary_container_small_extended_fab_content_desc"
277-
android:text="@string/extended_fab_label"
278-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
279-
app:icon="@drawable/ic_add_24px" />
280-
<TextView
281-
android:layout_width="wrap_content"
282-
android:layout_height="wrap_content"
283-
android:layout_marginRight="24dp"
284-
android:layout_gravity="start|center"
285-
android:text="@string/m3_medium_extended_fab_label"/>
286-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
287-
style="?attr/extendedFloatingActionButtonMediumStyle"
288-
android:layout_width="wrap_content"
289-
android:layout_height="wrap_content"
290-
android:layout_margin="8dp"
291-
android:layout_gravity="center"
292-
android:contentDescription="@string/m3_secondary_container_medium_extended_fab_content_desc"
293-
android:text="@string/extended_fab_label"
294-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
295-
app:icon="@drawable/ic_add_24px" />
296-
<TextView
297-
android:layout_width="wrap_content"
298-
android:layout_height="wrap_content"
299-
android:layout_marginRight="24dp"
300-
android:layout_gravity="start|center"
301-
android:text="@string/m3_large_extended_fab_label"/>
302-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
303-
style="?attr/extendedFloatingActionButtonLargeStyle"
304-
android:layout_width="wrap_content"
305-
android:layout_height="wrap_content"
306-
android:layout_margin="8dp"
307-
android:layout_gravity="center"
308-
android:contentDescription="@string/m3_secondary_container_large_extended_fab_content_desc"
309-
android:text="@string/extended_fab_label"
310-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
311-
app:icon="@drawable/ic_add_24px" />
312-
313-
<TextView
314-
android:layout_width="wrap_content"
315-
android:layout_height="wrap_content"
316-
android:layout_gravity="start|center"
317-
android:layout_columnSpan="2"
318-
android:textAppearance="?attr/textAppearanceTitleLarge"
319-
android:text="@string/m3_tertiary_container_extended_fab_label" />
320-
321-
<TextView
322-
android:layout_width="wrap_content"
323-
android:layout_height="wrap_content"
324-
android:layout_marginRight="24dp"
325-
android:layout_gravity="start|center"
326-
android:text="@string/m3_small_extended_fab_label"/>
327-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
328-
style="?attr/extendedFloatingActionButtonSmallStyle"
329-
android:layout_width="wrap_content"
330-
android:layout_height="wrap_content"
331-
android:layout_margin="8dp"
332-
android:layout_gravity="center"
333-
android:contentDescription="@string/m3_tertiary_container_small_extended_fab_content_desc"
334-
android:text="@string/extended_fab_label"
335-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
336-
app:icon="@drawable/ic_add_24px" />
337-
<TextView
338-
android:layout_width="wrap_content"
339-
android:layout_height="wrap_content"
340-
android:layout_marginRight="24dp"
341-
android:layout_gravity="start|center"
342-
android:text="@string/m3_medium_extended_fab_label"/>
343-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
344-
style="?attr/extendedFloatingActionButtonMediumStyle"
345-
android:layout_width="wrap_content"
346-
android:layout_height="wrap_content"
347-
android:layout_margin="8dp"
348-
android:layout_gravity="center"
349-
android:contentDescription="@string/m3_tertiary_container_medium_extended_fab_content_desc"
350-
android:text="@string/extended_fab_label"
351-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
352-
app:icon="@drawable/ic_add_24px" />
353-
<TextView
354-
android:layout_width="wrap_content"
355-
android:layout_height="wrap_content"
356-
android:layout_marginRight="24dp"
357-
android:layout_gravity="start|center"
358-
android:text="@string/m3_large_extended_fab_label"/>
359-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
360-
style="?attr/extendedFloatingActionButtonLargeStyle"
361-
android:layout_width="wrap_content"
362-
android:layout_height="wrap_content"
363-
android:layout_margin="8dp"
364-
android:layout_gravity="center"
365-
android:contentDescription="@string/m3_tertiary_container_large_extended_fab_content_desc"
366-
android:text="@string/extended_fab_label"
367-
app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
196+
app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
368197
app:icon="@drawable/ic_add_24px" />
369198

370199
</GridLayout>

0 commit comments

Comments
 (0)