[Dialog] Unified scrim opacity in Material themes/theme overlays.

Resolves #3643 PiperOrigin-RevId: 579005745
material-components · Nov 6, 2023 · f3e4439 · f3e4439
1 parent f876242
commit f3e4439
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
@@ -266,9 +266,10 @@
     <item name="elevationOverlayEnabled">true</item>
     <item name="elevationOverlayColor">@macro/m3_sys_color_light_surface_tint</item>
 
-    <!-- Dialog themes. -->
+    <!-- Dialog themes and scrim. -->
     <item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
     <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
+    <item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
 
     <!-- Picker styles and themes. -->
     <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
@@ -527,9 +528,10 @@
     <item name="elevationOverlayEnabled">true</item>
     <item name="elevationOverlayColor">@macro/m3_sys_color_dark_surface_tint</item>
 
-    <!-- Dialog themes. -->
+    <!-- Dialog themes and scrim. -->
     <item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
     <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
+    <item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
 
     <!-- Picker styles and themes. -->
     <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>

diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml b/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml
@@ -35,7 +35,7 @@
     <item name="buttonBarPositiveButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog</item>
     <item name="buttonBarNegativeButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog</item>
     <item name="buttonBarNeutralButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
-    <item name="android:backgroundDimAmount">0.32</item>
+    <item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
     <item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialog.MaterialComponents.Body.Text</item>
   </style>
 
@@ -74,6 +74,7 @@
   <style name="Base.ThemeOverlay.Material3.Dialog" parent="Base.ThemeOverlay.MaterialComponents.Dialog">
     <item name="materialButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog.Flush</item>
     <item name="android:windowAnimationStyle">@style/MaterialAlertDialog.Material3.Animation</item>
+    <item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
   </style>
 
   <style name="ThemeOverlay.Material3.Dialog" parent="Base.ThemeOverlay.Material3.Dialog"/>

diff --git a/lib/java/com/google/android/material/dialog/res/values/tokens.xml b/lib/java/com/google/android/material/dialog/res/values/tokens.xml
@@ -30,4 +30,7 @@
   <macro name="m3_comp_dialog_supporting_text_type">?attr/textAppearanceBodyMedium</macro>
   <macro name="m3_comp_dialog_supporting_text_color">?attr/colorOnSurfaceVariant</macro>
 
+  <!-- Generated from token set (md.comp.scrim) in context (platform=android, audience=3p). -->
+  <item name="m3_comp_scrim_container_opacity" format="float" type="dimen">0.32</item>
+
 </resources>
diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
@@ -95,11 +95,12 @@
     <item name="colorPrimaryVariant">?attr/colorPrimary</item>
     <item name="colorSecondaryVariant">?attr/colorSecondary</item>
 
-    <!-- Dialog themes. -->
+    <!-- Dialog themes and scrim. -->
     <item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
     <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Material3.BottomSheetDialog</item>
     <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
     <item name="sideSheetDialogTheme">@style/ThemeOverlay.Material3.SideSheetDialog</item>
+    <item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
 
     <!-- Picker styles and themes. -->
     <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
@@ -359,11 +360,12 @@
     <item name="colorPrimaryVariant">?attr/colorPrimary</item>
     <item name="colorSecondaryVariant">?attr/colorSecondary</item>
 
-    <!-- Dialog themes. -->
+    <!-- Dialog themes and scrim. -->
     <item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
     <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Material3.BottomSheetDialog</item>
     <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
     <item name="sideSheetDialogTheme">@style/ThemeOverlay.Material3.SideSheetDialog</item>
+    <item name="android:backgroundDimAmount">@dimen/m3_comp_scrim_container_opacity</item>
 
     <!-- Picker styles and themes. -->
     <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>