Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8a59cae authored by James O'Leary's avatar James O'Leary
Browse files

Add colors resources for Material color scheme. 

Bug: 266484809
Test: Verify build completes.
Change-Id: I0bc36dd1b2de386b9f33a126937926d3dd382bb8
parent 796c571a

core/api/current.txt

+110 −0
Original line number Diff line number Diff line
@@ -1898,6 +1898,18 @@ package android { 
    field public static final int system_accent3_700 = 17170522; // 0x106005a

    field public static final int system_accent3_800 = 17170523; // 0x106005b

    field public static final int system_accent3_900 = 17170524; // 0x106005c

    field public static final int system_background_dark;

    field public static final int system_background_light;

    field public static final int system_control_activated_dark;

    field public static final int system_control_activated_light;

    field public static final int system_control_highlight_dark;

    field public static final int system_control_highlight_light;

    field public static final int system_control_normal_dark;

    field public static final int system_control_normal_light;

    field public static final int system_error_container_dark;

    field public static final int system_error_container_light;

    field public static final int system_error_dark;

    field public static final int system_error_light;

    field public static final int system_neutral1_0 = 17170461; // 0x106001d

    field public static final int system_neutral1_10 = 17170462; // 0x106001e

    field public static final int system_neutral1_100 = 17170464; // 0x1060020
@@ -1924,6 +1936,104 @@ package android { 
    field public static final int system_neutral2_700 = 17170483; // 0x1060033

    field public static final int system_neutral2_800 = 17170484; // 0x1060034

    field public static final int system_neutral2_900 = 17170485; // 0x1060035

    field public static final int system_on_background_dark;

    field public static final int system_on_background_light;

    field public static final int system_on_error_container_dark;

    field public static final int system_on_error_container_light;

    field public static final int system_on_error_dark;

    field public static final int system_on_error_light;

    field public static final int system_on_primary_container_dark;

    field public static final int system_on_primary_container_light;

    field public static final int system_on_primary_dark;

    field public static final int system_on_primary_fixed_dark;

    field public static final int system_on_primary_fixed_light;

    field public static final int system_on_primary_fixed_variant_dark;

    field public static final int system_on_primary_fixed_variant_light;

    field public static final int system_on_primary_light;

    field public static final int system_on_secondary_container_dark;

    field public static final int system_on_secondary_container_light;

    field public static final int system_on_secondary_dark;

    field public static final int system_on_secondary_fixed_dark;

    field public static final int system_on_secondary_fixed_light;

    field public static final int system_on_secondary_fixed_variant_dark;

    field public static final int system_on_secondary_fixed_variant_light;

    field public static final int system_on_secondary_light;

    field public static final int system_on_surface_dark;

    field public static final int system_on_surface_light;

    field public static final int system_on_surface_variant_dark;

    field public static final int system_on_surface_variant_light;

    field public static final int system_on_tertiary_container_dark;

    field public static final int system_on_tertiary_container_light;

    field public static final int system_on_tertiary_dark;

    field public static final int system_on_tertiary_fixed_dark;

    field public static final int system_on_tertiary_fixed_light;

    field public static final int system_on_tertiary_fixed_variant_dark;

    field public static final int system_on_tertiary_fixed_variant_light;

    field public static final int system_on_tertiary_light;

    field public static final int system_outline_dark;

    field public static final int system_outline_light;

    field public static final int system_palette_key_color_neutral_dark;

    field public static final int system_palette_key_color_neutral_light;

    field public static final int system_palette_key_color_neutral_variant_dark;

    field public static final int system_palette_key_color_neutral_variant_light;

    field public static final int system_palette_key_color_primary_dark;

    field public static final int system_palette_key_color_primary_light;

    field public static final int system_palette_key_color_secondary_dark;

    field public static final int system_palette_key_color_secondary_light;

    field public static final int system_palette_key_color_tertiary_dark;

    field public static final int system_palette_key_color_tertiary_light;

    field public static final int system_primary_container_dark;

    field public static final int system_primary_container_light;

    field public static final int system_primary_dark;

    field public static final int system_primary_fixed_dark;

    field public static final int system_primary_fixed_darker_light;

    field public static final int system_primary_fixed_light;

    field public static final int system_primary_fixeder_dark;

    field public static final int system_primary_light;

    field public static final int system_secondary_container_dark;

    field public static final int system_secondary_container_light;

    field public static final int system_secondary_dark;

    field public static final int system_secondary_fixed_dark;

    field public static final int system_secondary_fixed_darker_light;

    field public static final int system_secondary_fixed_light;

    field public static final int system_secondary_fixeder_dark;

    field public static final int system_secondary_light;

    field public static final int system_surface_bright_dark;

    field public static final int system_surface_bright_light;

    field public static final int system_surface_container_dark;

    field public static final int system_surface_container_high_dark;

    field public static final int system_surface_container_high_light;

    field public static final int system_surface_container_highest_dark;

    field public static final int system_surface_container_highest_light;

    field public static final int system_surface_container_light;

    field public static final int system_surface_container_low_dark;

    field public static final int system_surface_container_low_light;

    field public static final int system_surface_container_lowest_dark;

    field public static final int system_surface_container_lowest_light;

    field public static final int system_surface_dark;

    field public static final int system_surface_dim_dark;

    field public static final int system_surface_dim_light;

    field public static final int system_surface_light;

    field public static final int system_surface_variant_dark;

    field public static final int system_surface_variant_light;

    field public static final int system_tertiary_container_dark;

    field public static final int system_tertiary_container_light;

    field public static final int system_tertiary_dark;

    field public static final int system_tertiary_fixed_dark;

    field public static final int system_tertiary_fixed_darker_light;

    field public static final int system_tertiary_fixed_light;

    field public static final int system_tertiary_fixeder_dark;

    field public static final int system_tertiary_light;

    field public static final int system_text_hint_inverse_dark;

    field public static final int system_text_hint_inverse_light;

    field public static final int system_text_primary_inverse_dark;

    field public static final int system_text_primary_inverse_disable_only_dark;

    field public static final int system_text_primary_inverse_disable_only_light;

    field public static final int system_text_primary_inverse_light;

    field public static final int system_text_secondary_and_tertiary_inverse_dark;

    field public static final int system_text_secondary_and_tertiary_inverse_disabled_dark;

    field public static final int system_text_secondary_and_tertiary_inverse_disabled_light;

    field public static final int system_text_secondary_and_tertiary_inverse_light;

    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

core/res/res/values/colors.xml

+113 −0
Original line number Diff line number Diff line
@@ -435,6 +435,119 @@ 
     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_neutral2_1000">#000000</color>



    <!-- Colors used in Android system, from Material design system.

     These values can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_primary_container_light">#D8E2FF</color>

    <color name="system_on_primary_container_light">#001A41</color>

    <color name="system_primary_light">#445E91</color>

    <color name="system_on_primary_light">#FFFFFF</color>

    <color name="system_secondary_container_light">#DBE2F9</color>

    <color name="system_on_secondary_container_light">#141B2C</color>

    <color name="system_secondary_light">#575E71</color>

    <color name="system_on_secondary_light">#FFFFFF</color>

    <color name="system_tertiary_container_light">#FBD7FC</color>

    <color name="system_on_tertiary_container_light">#29132D</color>

    <color name="system_tertiary_light">#715573</color>

    <color name="system_on_tertiary_light">#FFFFFF</color>

    <color name="system_background_light">#FAF9FD</color>

    <color name="system_on_background_light">#1B1B1F</color>

    <color name="system_surface_light">#FAF9FD</color>

    <color name="system_on_surface_light">#1B1B1F</color>

    <color name="system_surface_container_low_light">#F5F3F7</color>

    <color name="system_surface_container_lowest_light">#FFFFFF</color>

    <color name="system_surface_container_light">#EFEDF1</color>

    <color name="system_surface_container_high_light">#E9E7EC</color>

    <color name="system_surface_container_highest_light">#E3E2E6</color>

    <color name="system_surface_bright_light">#FAF9FD</color>

    <color name="system_surface_dim_light">#DBD9DD</color>

    <color name="system_surface_variant_light">#E1E2EC</color>

    <color name="system_on_surface_variant_light">#44474F</color>

    <color name="system_outline_light">#72747D</color>

    <color name="system_error_light">#C00003</color>

    <color name="system_on_error_light">#FFFFFF</color>

    <color name="system_error_container_light">#FFDAD5</color>

    <color name="system_on_error_container_light">#410000</color>

    <color name="system_primary_fixed_light">#D8E2FF</color>

    <color name="system_primary_fixed_darker_light">#ADC6FF</color>

    <color name="system_on_primary_fixed_light">#001A41</color>

    <color name="system_on_primary_fixed_variant_light">#2B4678</color>

    <color name="system_secondary_fixed_light">#DBE2F9</color>

    <color name="system_secondary_fixed_darker_light">#BFC6DC</color>

    <color name="system_on_secondary_fixed_light">#141B2C</color>

    <color name="system_on_secondary_fixed_variant_light">#3F4759</color>

    <color name="system_tertiary_fixed_light">#FBD7FC</color>

    <color name="system_tertiary_fixed_darker_light">#DEBCDF</color>

    <color name="system_on_tertiary_fixed_light">#29132D</color>

    <color name="system_on_tertiary_fixed_variant_light">#583E5B</color>

    <color name="system_control_activated_light">#D8E2FF</color>

    <color name="system_control_normal_light">#44474F</color>

    <color name="system_control_highlight_light">#1F000000</color>

    <color name="system_text_primary_inverse_light">#E3E2E6</color>

    <color name="system_text_secondary_and_tertiary_inverse_light">#C4C6D0</color>

    <color name="system_text_primary_inverse_disable_only_light">#E3E2E6</color>

    <color name="system_text_secondary_and_tertiary_inverse_disabled_light">#E3E2E6</color>

    <color name="system_text_hint_inverse_light">#E3E2E6</color>

    <color name="system_palette_key_color_primary_light">#5D77AC</color>

    <color name="system_palette_key_color_secondary_light">#6C7488</color>

    <color name="system_palette_key_color_tertiary_light">#907292</color>

    <color name="system_palette_key_color_neutral_light">#838387</color>

    <color name="system_palette_key_color_neutral_variant_light">#777982</color>

    <color name="system_primary_container_dark">#2B4678</color>

    <color name="system_on_primary_container_dark">#D8E2FF</color>

    <color name="system_primary_dark">#ADC6FF</color>

    <color name="system_on_primary_dark">#102F60</color>

    <color name="system_secondary_container_dark">#3F4759</color>

    <color name="system_on_secondary_container_dark">#DBE2F9</color>

    <color name="system_secondary_dark">#BFC6DC</color>

    <color name="system_on_secondary_dark">#293041</color>

    <color name="system_tertiary_container_dark">#583E5B</color>

    <color name="system_on_tertiary_container_dark">#FBD7FC</color>

    <color name="system_tertiary_dark">#DEBCDF</color>

    <color name="system_on_tertiary_dark">#402843</color>

    <color name="system_background_dark">#121316</color>

    <color name="system_on_background_dark">#E3E2E6</color>

    <color name="system_surface_dark">#121316</color>

    <color name="system_on_surface_dark">#E3E2E6</color>

    <color name="system_surface_container_low_dark">#1B1B1F</color>

    <color name="system_surface_container_lowest_dark">#0D0E11</color>

    <color name="system_surface_container_dark">#1F1F23</color>

    <color name="system_surface_container_high_dark">#292A2D</color>

    <color name="system_surface_container_highest_dark">#343538</color>

    <color name="system_surface_bright_dark">#38393C</color>

    <color name="system_surface_dim_dark">#121316</color>

    <color name="system_surface_variant_dark">#44474F</color>

    <color name="system_on_surface_variant_dark">#C4C6D0</color>

    <color name="system_outline_dark">#72747D</color>

    <color name="system_error_dark">#FFB4A8</color>

    <color name="system_on_error_dark">#690001</color>

    <color name="system_error_container_dark">#930001</color>

    <color name="system_on_error_container_dark">#FFDAD5</color>

    <color name="system_primary_fixed_dark">#D8E2FF</color>

    <color name="system_primary_fixeder_dark">#ADC6FF</color>

    <color name="system_on_primary_fixed_dark">#001A41</color>

    <color name="system_on_primary_fixed_variant_dark">#2B4678</color>

    <color name="system_secondary_fixed_dark">#DBE2F9</color>

    <color name="system_secondary_fixeder_dark">#BFC6DC</color>

    <color name="system_on_secondary_fixed_dark">#141B2C</color>

    <color name="system_on_secondary_fixed_variant_dark">#3F4759</color>

    <color name="system_tertiary_fixed_dark">#FBD7FC</color>

    <color name="system_tertiary_fixeder_dark">#DEBCDF</color>

    <color name="system_on_tertiary_fixed_dark">#29132D</color>

    <color name="system_on_tertiary_fixed_variant_dark">#583E5B</color>

    <color name="system_control_activated_dark">#2B4678</color>

    <color name="system_control_normal_dark">#C4C6D0</color>

    <color name="system_control_highlight_dark">#33FFFFFF</color>

    <color name="system_text_primary_inverse_dark">#1B1B1F</color>

    <color name="system_text_secondary_and_tertiary_inverse_dark">#44474F</color>

    <color name="system_text_primary_inverse_disable_only_dark">#1B1B1F</color>

    <color name="system_text_secondary_and_tertiary_inverse_disabled_dark">#1B1B1F</color>

    <color name="system_text_hint_inverse_dark">#1B1B1F</color>

    <color name="system_palette_key_color_primary_dark">#5D77AC</color>

    <color name="system_palette_key_color_secondary_dark">#6C7488</color>

    <color name="system_palette_key_color_tertiary_dark">#907292</color>

    <color name="system_palette_key_color_neutral_dark">#838387</color>

    <color name="system_palette_key_color_neutral_variant_dark">#777982</color>



    <!-- Accessibility shortcut icon background color -->

    <color name="accessibility_feature_background">#5F6368</color> <!-- Google grey 700 -->

    <color name="accessibility_magnification_background">#F50D60</color>

core/res/res/values/public-staging.xml

+110 −0
Original line number Diff line number Diff line
@@ -154,6 +154,116 @@ 
  </staging-public-group>



  <staging-public-group type="color" first-id="0x01c90000">

    <public name="system_primary_container_light" />

    <public name="system_on_primary_container_light" />

    <public name="system_primary_light" />

    <public name="system_on_primary_light" />

    <public name="system_secondary_container_light" />

    <public name="system_on_secondary_container_light" />

    <public name="system_secondary_light" />

    <public name="system_on_secondary_light" />

    <public name="system_tertiary_container_light" />

    <public name="system_on_tertiary_container_light" />

    <public name="system_tertiary_light" />

    <public name="system_on_tertiary_light" />

    <public name="system_background_light" />

    <public name="system_on_background_light" />

    <public name="system_surface_light" />

    <public name="system_on_surface_light" />

    <public name="system_surface_container_low_light" />

    <public name="system_surface_container_lowest_light" />

    <public name="system_surface_container_light" />

    <public name="system_surface_container_high_light" />

    <public name="system_surface_container_highest_light" />

    <public name="system_surface_bright_light" />

    <public name="system_surface_dim_light" />

    <public name="system_surface_variant_light" />

    <public name="system_on_surface_variant_light" />

    <public name="system_outline_light" />

    <public name="system_error_light" />

    <public name="system_on_error_light" />

    <public name="system_error_container_light" />

    <public name="system_on_error_container_light" />

    <public name="system_primary_fixed_light" />

    <public name="system_primary_fixed_darker_light" />

    <public name="system_on_primary_fixed_light" />

    <public name="system_on_primary_fixed_variant_light" />

    <public name="system_secondary_fixed_light" />

    <public name="system_secondary_fixed_darker_light" />

    <public name="system_on_secondary_fixed_light" />

    <public name="system_on_secondary_fixed_variant_light" />

    <public name="system_tertiary_fixed_light" />

    <public name="system_tertiary_fixed_darker_light" />

    <public name="system_on_tertiary_fixed_light" />

    <public name="system_on_tertiary_fixed_variant_light" />

    <public name="system_control_activated_light" />

    <public name="system_control_normal_light" />

    <public name="system_control_highlight_light" />

    <public name="system_text_primary_inverse_light" />

    <public name="system_text_secondary_and_tertiary_inverse_light" />

    <public name="system_text_primary_inverse_disable_only_light" />

    <public name="system_text_secondary_and_tertiary_inverse_disabled_light" />

    <public name="system_text_hint_inverse_light" />

    <public name="system_palette_key_color_primary_light" />

    <public name="system_palette_key_color_secondary_light" />

    <public name="system_palette_key_color_tertiary_light" />

    <public name="system_palette_key_color_neutral_light" />

    <public name="system_palette_key_color_neutral_variant_light" />

    <public name="system_primary_container_dark"/>

    <public name="system_on_primary_container_dark"/>

    <public name="system_primary_dark"/>

    <public name="system_on_primary_dark"/>

    <public name="system_secondary_container_dark"/>

    <public name="system_on_secondary_container_dark"/>

    <public name="system_secondary_dark"/>

    <public name="system_on_secondary_dark"/>

    <public name="system_tertiary_container_dark"/>

    <public name="system_on_tertiary_container_dark"/>

    <public name="system_tertiary_dark"/>

    <public name="system_on_tertiary_dark"/>

    <public name="system_background_dark"/>

    <public name="system_on_background_dark"/>

    <public name="system_surface_dark"/>

    <public name="system_on_surface_dark"/>

    <public name="system_surface_container_low_dark"/>

    <public name="system_surface_container_lowest_dark"/>

    <public name="system_surface_container_dark"/>

    <public name="system_surface_container_high_dark"/>

    <public name="system_surface_container_highest_dark"/>

    <public name="system_surface_bright_dark"/>

    <public name="system_surface_dim_dark"/>

    <public name="system_surface_variant_dark"/>

    <public name="system_on_surface_variant_dark"/>

    <public name="system_outline_dark"/>

    <public name="system_error_dark"/>

    <public name="system_on_error_dark"/>

    <public name="system_error_container_dark"/>

    <public name="system_on_error_container_dark"/>

    <public name="system_primary_fixed_dark"/>

    <public name="system_primary_fixeder_dark"/>

    <public name="system_on_primary_fixed_dark"/>

    <public name="system_on_primary_fixed_variant_dark"/>

    <public name="system_secondary_fixed_dark"/>

    <public name="system_secondary_fixeder_dark"/>

    <public name="system_on_secondary_fixed_dark"/>

    <public name="system_on_secondary_fixed_variant_dark"/>

    <public name="system_tertiary_fixed_dark"/>

    <public name="system_tertiary_fixeder_dark"/>

    <public name="system_on_tertiary_fixed_dark"/>

    <public name="system_on_tertiary_fixed_variant_dark"/>

    <public name="system_control_activated_dark"/>

    <public name="system_control_normal_dark"/>

    <public name="system_control_highlight_dark"/>

    <public name="system_text_primary_inverse_dark"/>

    <public name="system_text_secondary_and_tertiary_inverse_dark"/>

    <public name="system_text_primary_inverse_disable_only_dark"/>

    <public name="system_text_secondary_and_tertiary_inverse_disabled_dark"/>

    <public name="system_text_hint_inverse_dark"/>

    <public name="system_palette_key_color_primary_dark"/>

    <public name="system_palette_key_color_secondary_dark"/>

    <public name="system_palette_key_color_tertiary_dark"/>

    <public name="system_palette_key_color_neutral_dark"/>

    <public name="system_palette_key_color_neutral_variant_dark"/>

  </staging-public-group>



  <staging-public-group type="array" first-id="0x01c80000">