For #22809 - Use the design tokens for the Scrim Start/End colors

upstream-sync
Gabriel Luong 3 years ago committed by mergify[bot]
parent d457050da2
commit da0cb197ac

@ -17,8 +17,8 @@
<!-- Selected tab -->
<color name="fx_mobile_layer_color_accent_nonopaque" tools:ignore="UnusedResources">@color/photonViolet40A12</color>
<color name="fx_mobile_layer_color_scrim" tools:ignore="UnusedResources">@color/photonDarkGrey05A45</color>
<color name="fx_mobile_layer_color_scrim_start" tools:ignore="UnusedResources">@color/photonInk80A96</color>
<color name="fx_mobile_layer_color_scrim_end" tools:ignore="UnusedResources">@color/photonDarkGrey90A96</color>
<color name="fx_mobile_layer_color_scrim_start">@color/photonInk80A96</color>
<color name="fx_mobile_layer_color_scrim_end">@color/photonDarkGrey90A96</color>
<!-- Tooltip -->
<color name="fx_mobile_layer_color_gradient_start" tools:ignore="UnusedResources">@color/photonViolet70</color>
<!-- Tooltip -->
@ -107,8 +107,6 @@
<color name="neutral_faded_normal_theme">#1FFBFBFE</color>
<color name="destructive_normal_theme">@color/photonRed40</color>
<color name="disabled_normal_theme">#66FBFBFE</color>
<color name="scrimStart_normal_theme">#F520123A</color>
<color name="scrimEnd_normal_theme">#F515141A</color>
<color name="toggle_off_knob_normal_theme">@color/toggle_off_knob_dark_theme</color>
<color name="toggle_off_track_normal_theme">@color/toggle_off_track_dark_theme</color>
<color name="snackbar_normal_theme">@color/accent_bright_dark_theme</color>

@ -17,8 +17,8 @@
<!-- Selected tab -->
<color name="fx_mobile_layer_color_accent_nonopaque" tools:ignore="UnusedResources">@color/photonViolet90A20</color>
<color name="fx_mobile_layer_color_scrim" tools:ignore="UnusedResources">@color/photonDarkGrey05A45</color>
<color name="fx_mobile_layer_color_scrim_start" tools:ignore="UnusedResources">@color/photonDarkGrey90A96</color>
<color name="fx_mobile_layer_color_scrim_end" tools:ignore="UnusedResources">@color/photonDarkGrey30A96</color>
<color name="fx_mobile_layer_color_scrim_start">@color/photonDarkGrey90A96</color>
<color name="fx_mobile_layer_color_scrim_end">@color/photonDarkGrey30A96</color>
<!-- Tooltip -->
<color name="fx_mobile_layer_color_gradient_start" tools:ignore="UnusedResources">@color/photonViolet70</color>
<!-- Tooltip -->
@ -184,8 +184,6 @@
<color name="neutral_faded_normal_theme">@color/photonGrey20</color>
<color name="destructive_normal_theme">@color/photonRed70</color>
<color name="disabled_normal_theme">#6620123A</color>
<color name="scrimStart_normal_theme">#F515141A</color>
<color name="scrimEnd_normal_theme">#F542414D</color>
<color name="snackbar_normal_theme">@color/accent_light_theme</color>
<color name="accent_on_dark_background_normal_theme">@color/accent_bright_light_theme</color>
<color name="toolbar_start_gradient_normal_theme">@color/foundation_light_theme</color>

@ -54,8 +54,8 @@
<item name="neutralFaded">@color/neutral_faded_normal_theme</item>
<item name="destructive">@color/destructive_normal_theme</item>
<item name="disabled">@color/disabled_normal_theme</item>
<item name="scrimStart">@color/scrimStart_normal_theme</item>
<item name="scrimEnd">@color/scrimEnd_normal_theme</item>
<item name="scrimStart">@color/fx_mobile_layer_color_scrim_start</item>
<item name="scrimEnd">@color/fx_mobile_layer_color_scrim_end</item>
<item name="snackbar">@color/snackbar_normal_theme</item>
<item name="accentUsedOnDarkBackground">@color/accent_on_dark_background_normal_theme</item>
<item name="toolbarStartGradient">@color/toolbar_start_gradient_normal_theme</item>

Loading…
Cancel
Save