[Tokens] Integrated elevation overlay color.

PiperOrigin-RevId: 456827685
material-components · Jun 24, 2022 · d320d48 · d320d48
1 parent 4188995
commit d320d48
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/java/com/google/android/material/color/res/values/tokens.xml b/lib/java/com/google/android/material/color/res/values/tokens.xml
@@ -42,6 +42,7 @@
   <color name="m3_sys_color_dark_on_surface_variant">@color/m3_ref_palette_neutral_variant80</color>
   <color name="m3_sys_color_dark_inverse_surface">@color/m3_ref_palette_neutral90</color>
   <color name="m3_sys_color_dark_inverse_on_surface">@color/m3_ref_palette_neutral20</color>
+  <macro name="m3_sys_color_dark_surface_tint">?attr/colorPrimary</macro>
   <!-- Background colors -->
   <color name="m3_sys_color_dark_background">@color/m3_ref_palette_neutral10</color>
   <color name="m3_sys_color_dark_on_background">@color/m3_ref_palette_neutral90</color>
@@ -76,6 +77,7 @@
   <color name="m3_sys_color_light_on_surface_variant">@color/m3_ref_palette_neutral_variant30</color>
   <color name="m3_sys_color_light_inverse_surface">@color/m3_ref_palette_neutral20</color>
   <color name="m3_sys_color_light_inverse_on_surface">@color/m3_ref_palette_neutral95</color>
+  <macro name="m3_sys_color_light_surface_tint">?attr/colorPrimary</macro>
   <!-- Background colors -->
   <color name="m3_sys_color_light_background">@color/m3_ref_palette_neutral99</color>
   <color name="m3_sys_color_light_on_background">@color/m3_ref_palette_neutral10</color>

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
@@ -237,7 +237,7 @@
 
     <!-- Elevation overlays. -->
     <item name="elevationOverlayEnabled">true</item>
-    <item name="elevationOverlayColor">?attr/colorPrimary</item>
+    <item name="elevationOverlayColor">@macro/m3_sys_color_light_surface_tint</item>
 
     <!-- Dialog themes. -->
     <item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
@@ -471,7 +471,7 @@
 
     <!-- Elevation overlays. -->
     <item name="elevationOverlayEnabled">true</item>
-    <item name="elevationOverlayColor">?attr/colorPrimary</item>
+    <item name="elevationOverlayColor">@macro/m3_sys_color_dark_surface_tint</item>
 
     <!-- Dialog themes. -->
     <item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>

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
@@ -249,7 +249,7 @@
 
     <!-- Elevation overlays. -->
     <item name="elevationOverlayEnabled">true</item>
-    <item name="elevationOverlayColor">?attr/colorPrimary</item>
+    <item name="elevationOverlayColor">@macro/m3_sys_color_light_surface_tint</item>
 
     <!-- Theme overlays. -->
     <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Light</item>
@@ -485,7 +485,7 @@
 
     <!-- Elevation overlays. -->
     <item name="elevationOverlayEnabled">true</item>
-    <item name="elevationOverlayColor">?attr/colorPrimary</item>
+    <item name="elevationOverlayColor">@macro/m3_sys_color_dark_surface_tint</item>
 
     <!-- Theme overlays. -->
     <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Dark</item>