Merge "Map some more colors to new palette" into sc-dev am: 06b26afe43

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13418659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30a1dfb821e8c224e765fb8c74c30dbb65bd4748
This commit is contained in:
Lucas Dupin
2021-01-29 00:51:52 +00:00
committed by Automerger Merge Worker

View File

@@ -17,14 +17,14 @@
<!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable
overlaying new theme colors. -->
<resources>
<color name="primary_device_default_dark">@color/primary_material_dark</color>
<color name="primary_device_default_light">@color/primary_material_light</color>
<color name="primary_device_default_settings">@color/primary_material_settings</color>
<color name="primary_device_default_settings_light">@color/primary_material_settings_light</color>
<color name="primary_dark_device_default_dark">@color/primary_dark_material_dark</color>
<color name="primary_dark_device_default_light">@color/primary_dark_material_light</color>
<color name="primary_dark_device_default_settings">@color/primary_dark_material_settings</color>
<color name="primary_dark_device_default_settings_light">@color/primary_dark_material_settings_light</color>
<color name="primary_device_default_dark">@color/system_main_900</color>
<color name="primary_device_default_light">@color/system_main_50</color>
<color name="primary_device_default_settings">@color/system_main_900</color>
<color name="primary_device_default_settings_light">@color/primary_device_default_light</color>
<color name="primary_dark_device_default_dark">@color/primary_device_default_dark</color>
<color name="primary_dark_device_default_light">@color/primary_device_default_light</color>
<color name="primary_dark_device_default_settings">@color/primary_device_default_dark</color>
<color name="primary_dark_device_default_settings_light">@color/primary_device_default_light</color>
<color name="navigation_bar_divider_device_default_settings">#1f000000</color>