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

Commit 3446415d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix color resource names for Material color scheme"

parents 3d817260 d29da06f

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -1989,17 +1989,17 @@ package android { 
    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_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_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;
@@ -2023,9 +2023,9 @@ package android { 
    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_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;

core/res/res/values/colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -523,15 +523,15 @@ 
    <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_primary_fixed_darker_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_secondary_fixed_darker_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_tertiary_fixed_darker_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>

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

+3 −3
Original line number Diff line number Diff line
@@ -242,15 +242,15 @@ 
    <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_primary_fixed_darker_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_secondary_fixed_darker_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_tertiary_fixed_darker_dark"/>

    <public name="system_on_tertiary_fixed_dark"/>

    <public name="system_on_tertiary_fixed_variant_dark"/>

    <public name="system_control_activated_dark"/>