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

Commit 9906ed4c authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Android (Google) Code Review
Browse files

Merge "New default color values for custom tokens." into main

parents c913ae4f 784ccf6d

core/res/res/values/colors.xml

+70 −70
Original line number Diff line number Diff line
@@ -480,17 +480,17 @@ 


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

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

    <color name="system_primary_container_light">#5E73A9</color>

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

    <color name="system_primary_light">#2A4174</color>

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

    <color name="system_on_primary_container_light">#001945</color>

    <color name="system_primary_light">#475D92</color>

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

    <color name="system_secondary_container_light">#6E7488</color>

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

    <color name="system_secondary_light">#3C4255</color>

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

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

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

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

    <color name="system_tertiary_container_light">#8A6A89</color>

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

    <color name="system_tertiary_light">#553A55</color>

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

    <color name="system_on_tertiary_container_light">#2A122C</color>

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

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

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

    <color name="system_on_background_light">#1A1B20</color>
@@ -504,13 +504,13 @@ 
    <color name="system_surface_bright_light">#FAF8FF</color>

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

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

    <color name="system_on_surface_variant_light">#40434B</color>

    <color name="system_outline_light">#5D5F67</color>

    <color name="system_outline_variant_light">#797A83</color>

    <color name="system_error_light">#8C0009</color>

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

    <color name="system_outline_light">#757780</color>

    <color name="system_outline_variant_light">#C5C6D0</color>

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

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

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

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

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

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

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

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

    <color name="system_control_highlight_light">#000000</color>
@@ -524,22 +524,22 @@ 
    <color name="system_palette_key_color_tertiary_light">#8C6D8C</color>

    <color name="system_palette_key_color_neutral_light">#76777D</color>

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

    <color name="system_primary_container_dark">#7A90C8</color>

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

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

    <color name="system_on_primary_dark">#00143B</color>

    <color name="system_secondary_container_dark">#8A90A5</color>

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

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

    <color name="system_on_secondary_dark">#0F1626</color>

    <color name="system_tertiary_container_dark">#A886A6</color>

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

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

    <color name="system_on_tertiary_dark">#240D26</color>

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

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

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

    <color name="system_on_primary_dark">#152E60</color>

    <color name="system_secondary_container_dark">#404659</color>

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

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

    <color name="system_on_secondary_dark">#2A3042</color>

    <color name="system_tertiary_container_dark">#593D59</color>

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

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

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

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

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

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

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

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

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

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

    <color name="system_surface_container_dark">#1E1F25</color>
@@ -548,13 +548,13 @@ 
    <color name="system_surface_bright_dark">#38393F</color>

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

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

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

    <color name="system_outline_dark">#A1A2AC</color>

    <color name="system_outline_variant_dark">#81838C</color>

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

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

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

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

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

    <color name="system_outline_dark">#8F9099</color>

    <color name="system_outline_variant_dark">#44464F</color>

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

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

    <color name="system_error_container_dark">#93000A</color>

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

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

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

    <color name="system_control_highlight_dark">#FFFFFF</color>
@@ -568,33 +568,33 @@ 
    <color name="system_palette_key_color_tertiary_dark">#8C6D8C</color>

    <color name="system_palette_key_color_neutral_dark">#76777D</color>

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

    <color name="system_primary_fixed">#5E73A9</color>

    <color name="system_primary_fixed_dim">#455B8F</color>

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

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

    <color name="system_secondary_fixed">#6E7488</color>

    <color name="system_secondary_fixed_dim">#555C6F</color>

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

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

    <color name="system_tertiary_fixed">#8A6A89</color>

    <color name="system_tertiary_fixed_dim">#705270</color>

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

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

    <color name="system_primary_fixed">#D9E2FF</color>

    <color name="system_primary_fixed_dim">#B0C6FF</color>

    <color name="system_on_primary_fixed">#001945</color>

    <color name="system_on_primary_fixed_variant">#2F4578</color>

    <color name="system_secondary_fixed">#DCE2F9</color>

    <color name="system_secondary_fixed_dim">#C0C6DC</color>

    <color name="system_on_secondary_fixed">#151B2C</color>

    <color name="system_on_secondary_fixed_variant">#404659</color>

    <color name="system_tertiary_fixed">#FDD7FA</color>

    <color name="system_tertiary_fixed_dim">#E0BBDD</color>

    <color name="system_on_tertiary_fixed">#2A122C</color>

    <color name="system_on_tertiary_fixed_variant">#593D59</color>



    <!--Colors used in Android system, from design system. These values can be overlaid at runtime

     by OverlayManager RROs.-->

    <color name="system_widget_background_light">#EEF0FF</color>

    <color name="system_clock_hour_light">#1D2435</color>

    <color name="system_clock_minute_light">#20386A</color>

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

    <color name="system_theme_app_light">#2F4578</color>

    <color name="system_on_theme_app_light">#D6DFFF</color>

    <color name="system_clock_hour_light">#373D50</color>

    <color name="system_clock_minute_light">#3D5487</color>

    <color name="system_clock_second_light">#4F659A</color>

    <color name="system_theme_app_light">#D9E2FF</color>

    <color name="system_on_theme_app_light">#475D92</color>

    <color name="system_theme_app_ring_light">#94AAE4</color>

    <color name="system_theme_notif_light">#FDD7FA</color>

    <color name="system_brand_a_light">#3A5084</color>

    <color name="system_theme_notif_light">#E0BBDD</color>

    <color name="system_brand_a_light">#475D92</color>

    <color name="system_brand_b_light">#6E7488</color>

    <color name="system_brand_c_light">#6076AC</color>

    <color name="system_brand_d_light">#8C6D8C</color>

    <color name="system_brand_c_light">#5E73A9</color>

    <color name="system_brand_d_light">#8A6A89</color>

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

<color name="system_shade_active_light">#D9E2FF</color>

    <color name="system_on_shade_active_light">#152E60</color>
@@ -603,19 +603,19 @@ 
    <color name="system_on_shade_inactive_light">#E1E2EC</color>

    <color name="system_on_shade_inactive_variant_light">#C5C6D0</color>

    <color name="system_shade_disabled_light">#0C0E13</color>

    <color name="system_overview_background_light">#50525A</color>

    <color name="system_overview_background_light">#C5C6D0</color>

    <color name="system_widget_background_dark">#152E60</color>

    <color name="system_clock_hour_dark">#9AA0B6</color>

    <color name="system_clock_minute_dark">#D8E1FF</color>

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

    <color name="system_theme_app_dark">#D9E2FF</color>

    <color name="system_on_theme_app_dark">#304679</color>

    <color name="system_clock_hour_dark">#8A90A5</color>

    <color name="system_clock_minute_dark">#D9E2FF</color>

    <color name="system_clock_second_dark">#B0C6FF</color>

    <color name="system_theme_app_dark">#2F4578</color>

    <color name="system_on_theme_app_dark">#B0C6FF</color>

    <color name="system_theme_app_ring_dark">#94AAE4</color>

    <color name="system_theme_notif_dark">#E0BBDD</color>

    <color name="system_brand_a_dark">#90A6DF</color>

    <color name="system_brand_b_dark">#A4ABC1</color>

    <color name="system_theme_notif_dark">#FDD7FA</color>

    <color name="system_brand_a_dark">#B0C6FF</color>

    <color name="system_brand_b_dark">#DCE2F9</color>

    <color name="system_brand_c_dark">#7A90C8</color>

    <color name="system_brand_d_dark">#A886A6</color>

    <color name="system_brand_d_dark">#FDD7FA</color>

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

<color name="system_shade_active_dark">#D9E2FF</color>

    <color name="system_on_shade_active_dark">#001945</color>
@@ -624,7 +624,7 @@ 
    <color name="system_on_shade_inactive_dark">#E1E2EC</color>

    <color name="system_on_shade_inactive_variant_dark">#C5C6D0</color>

    <color name="system_shade_disabled_dark">#0C0E13</color>

    <color name="system_overview_background_dark">#C5C6D0</color>

    <color name="system_overview_background_dark">#50525A</color>



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

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