Skip to content

Commit f3e4439

Browse files
manabu-nakamurapaulfthomas
authored andcommitted
[Dialog] Unified scrim opacity in Material themes/theme overlays.
Resolves #3643 PiperOrigin-RevId: 579005745
1 parent f876242 commit f3e4439

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

lib/java/com/google/android/material/dialog/res/values/themes_base.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,10 @@
266266
<item name="elevationOverlayEnabled">true</item>
267267
<item name="elevationOverlayColor">@macro/m3_sys_color_light_surface_tint</item>
268268

269-
<!-- Dialog themes. -->
269+
<!-- Dialog themes and scrim. -->
270270
<item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
271271
<item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
272+
<item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
272273

273274
<!-- Picker styles and themes. -->
274275
<item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
@@ -527,9 +528,10 @@
527528
<item name="elevationOverlayEnabled">true</item>
528529
<item name="elevationOverlayColor">@macro/m3_sys_color_dark_surface_tint</item>
529530

530-
<!-- Dialog themes. -->
531+
<!-- Dialog themes and scrim. -->
531532
<item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
532533
<item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
534+
<item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
533535

534536
<!-- Picker styles and themes. -->
535537
<item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<item name="buttonBarPositiveButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog</item>
3636
<item name="buttonBarNegativeButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog</item>
3737
<item name="buttonBarNeutralButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
38-
<item name="android:backgroundDimAmount">0.32</item>
38+
<item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
3939
<item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialog.MaterialComponents.Body.Text</item>
4040
</style>
4141

@@ -74,6 +74,7 @@
7474
<style name="Base.ThemeOverlay.Material3.Dialog" parent="Base.ThemeOverlay.MaterialComponents.Dialog">
7575
<item name="materialButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog.Flush</item>
7676
<item name="android:windowAnimationStyle">@style/MaterialAlertDialog.Material3.Animation</item>
77+
<item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
7778
</style>
7879

7980
<style name="ThemeOverlay.Material3.Dialog" parent="Base.ThemeOverlay.Material3.Dialog"/>

lib/java/com/google/android/material/dialog/res/values/tokens.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@
3030
<macro name="m3_comp_dialog_supporting_text_type">?attr/textAppearanceBodyMedium</macro>
3131
<macro name="m3_comp_dialog_supporting_text_color">?attr/colorOnSurfaceVariant</macro>
3232

33+
<!-- Generated from token set (md.comp.scrim) in context (platform=android, audience=3p). -->
34+
<item name="m3_comp_scrim_container_opacity" format="float" type="dimen">0.32</item>
35+
3336
</resources>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,12 @@
9595
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
9696
<item name="colorSecondaryVariant">?attr/colorSecondary</item>
9797

98-
<!-- Dialog themes. -->
98+
<!-- Dialog themes and scrim. -->
9999
<item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
100100
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Material3.BottomSheetDialog</item>
101101
<item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
102102
<item name="sideSheetDialogTheme">@style/ThemeOverlay.Material3.SideSheetDialog</item>
103+
<item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
103104

104105
<!-- Picker styles and themes. -->
105106
<item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
@@ -359,11 +360,12 @@
359360
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
360361
<item name="colorSecondaryVariant">?attr/colorSecondary</item>
361362

362-
<!-- Dialog themes. -->
363+
<!-- Dialog themes and scrim. -->
363364
<item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
364365
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Material3.BottomSheetDialog</item>
365366
<item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
366367
<item name="sideSheetDialogTheme">@style/ThemeOverlay.Material3.SideSheetDialog</item>
368+
<item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
367369

368370
<!-- Picker styles and themes. -->
369371
<item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>

0 commit comments

Comments
 (0)