Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose Material Design system palette

Browse Source 
Make system dominant and accent colors available to apps in multiple
shades ranging from 0 to 1000.

Also point system colors to the new palette on Theme.DeviceDefault

Fixes: 173628800
Test: atest SystemPalette
Test: manual
Change-Id: Ib9c3bbbb9e381bfc3a98788c33041dad4135d815
This commit is contained in:
Lucas Dupin
2020-12-28 13:28:16 -08:00
parent 7fe5eeefc0
commit 482f05ba3e
4 changed files with 132 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/api/current.txt
View File

@@ -1686,6 +1686,30 @@ package android {
field @Deprecated public static final int secondary_text_dark_nodisable = 17170438; // 0x1060006
field @Deprecated public static final int secondary_text_light = 17170439; // 0x1060007
field @Deprecated public static final int secondary_text_light_nodisable = 17170440; // 0x1060008
field public static final int system_accent_0 = 17170473; // 0x1060029
field public static final int system_accent_100 = 17170475; // 0x106002b
field public static final int system_accent_1000 = 17170484; // 0x1060034
field public static final int system_accent_200 = 17170476; // 0x106002c
field public static final int system_accent_300 = 17170477; // 0x106002d
field public static final int system_accent_400 = 17170478; // 0x106002e
field public static final int system_accent_50 = 17170474; // 0x106002a
field public static final int system_accent_500 = 17170479; // 0x106002f
field public static final int system_accent_600 = 17170480; // 0x1060030
field public static final int system_accent_700 = 17170481; // 0x1060031
field public static final int system_accent_800 = 17170482; // 0x1060032
field public static final int system_accent_900 = 17170483; // 0x1060033
field public static final int system_main_0 = 17170461; // 0x106001d
field public static final int system_main_100 = 17170463; // 0x106001f
field public static final int system_main_1000 = 17170472; // 0x1060028
field public static final int system_main_200 = 17170464; // 0x1060020
field public static final int system_main_300 = 17170465; // 0x1060021
field public static final int system_main_400 = 17170466; // 0x1060022
field public static final int system_main_50 = 17170462; // 0x106001e
field public static final int system_main_500 = 17170467; // 0x1060023
field public static final int system_main_600 = 17170468; // 0x1060024
field public static final int system_main_700 = 17170469; // 0x1060025
field public static final int system_main_800 = 17170470; // 0x1060026
field public static final int system_main_900 = 17170471; // 0x1060027
field public static final int tab_indicator_text = 17170441; // 0x1060009
field @Deprecated public static final int tertiary_text_dark = 17170448; // 0x1060010
field @Deprecated public static final int tertiary_text_light = 17170449; // 0x1060011

74
core/res/res/values/colors.xml
View File

@@ -234,4 +234,78 @@
<color name="personal_apps_suspension_notification_color">#1A73E8</color>
<color name="conversation_important_highlight">#F9AB00</color>
<!-- Lightest shade of the main color used by the system. White.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_0">#ffffff</color>
<!-- Shade of the main system color at 95% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_50">#ebf1f8</color>
<!-- Shade of the main system color at 90% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_100">#dde3ea</color>
<!-- Shade of the main system color at 80% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_200">#c1c7cd</color>
<!-- Shade of the main system color at 70% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_300">#a6acb2</color>
<!-- Shade of the main system color at 60% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_400">#8b9197</color>
<!-- Shade of the main system color at 50% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_500">#72787d</color>
<!-- Shade of the main system color at 40% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_600">#595f64</color>
<!-- Shade of the main system color at 30% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_700">#42474d</color>
<!-- Shade of the main system color at 20% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_800">#2c3136</color>
<!-- Shade of the main system color at 10% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_900">#171c21</color>
<!-- Darkest shade of the main color used by the system. Black.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_main_1000">#000000</color>
<!-- Lightest shade of the accent color used by the system. White.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_0">#ffffff</color>
<!-- Shade of the accent system color at 95% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_50">#91fff4</color>
<!-- Shade of the accent system color at 90% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_100">#83f6e5</color>
<!-- Shade of the accent system color at 80% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_200">#65d9c9</color>
<!-- Shade of the accent system color at 70% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_300">#45bdae</color>
<!-- Shade of the accent system color at 60% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_400">#1fa293</color>
<!-- Shade of the accent system color at 50% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_500">#00877a</color>
<!-- Shade of the accent system color at 40% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_600">#006d61</color>
<!-- Shade of the accent system color at 30% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_700">#005449</color>
<!-- Shade of the accent system color at 20% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_800">#003c33</color>
<!-- Shade of the accent system color at 10% lightness.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_900">#00271e</color>
<!-- Darkest shade of the accent color used by the system. Black.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_accent_1000">#000000</color>
</resources>

12
core/res/res/values/colors_device_defaults.xml
View File

@@ -33,14 +33,14 @@
<color name="tertiary_device_default_settings">@color/tertiary_material_settings</color>
<color name="quaternary_device_default_settings">@color/quaternary_material_settings</color>
<color name="accent_device_default_light">@color/accent_material_light</color>
<color name="accent_device_default_dark">@color/accent_material_dark</color>
<color name="accent_device_default_light">@color/system_accent_500</color>
<color name="accent_device_default_dark">@color/system_accent_200</color>
<color name="accent_device_default">@color/accent_device_default_light</color>
<color name="background_device_default_dark">#1A1A1A</color>
<color name="background_device_default_light">#F2F2F2</color>
<color name="background_floating_device_default_dark">#0D0D0D</color>
<color name="background_floating_device_default_light">#CCCCCC</color>
<color name="background_device_default_dark">@color/system_main_900</color>
<color name="background_device_default_light">@color/system_main_100</color>
<color name="background_floating_device_default_dark">@color/system_main_800</color>
<color name="background_floating_device_default_light">@color/system_main_200</color>
<!-- Error color -->
<color name="error_color_device_default_dark">@color/error_color_material_dark</color>

28
core/res/res/values/public.xml
View File

@@ -3058,6 +3058,34 @@
<public-group type="color" first-id="0x0106001d">
<!-- color definitions go here -->
<!-- Material design dynamic system palette:-->
<!-- Dominant color -->
<public name="system_main_0" />
<public name="system_main_50" />
<public name="system_main_100" />
<public name="system_main_200" />
<public name="system_main_300" />
<public name="system_main_400" />
<public name="system_main_500" />
<public name="system_main_600" />
<public name="system_main_700" />
<public name="system_main_800" />
<public name="system_main_900" />
<public name="system_main_1000" />
<!-- Accent color -->
<public name="system_accent_0" />
<public name="system_accent_50" />
<public name="system_accent_100" />
<public name="system_accent_200" />
<public name="system_accent_300" />
<public name="system_accent_400" />
<public name="system_accent_500" />
<public name="system_accent_600" />
<public name="system_accent_700" />
<public name="system_accent_800" />
<public name="system_accent_900" />
<public name="system_accent_1000" />
</public-group>
<public-group type="dimen" first-id="0x01050008">