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

Commit ec2e20e4 authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

Fix incorrectly named dim colors 

Rename fixed_darker to fixed_dim

RESOURCES_FINALIZATION=Fix incorrectly named API

Bug: 266484809
Test: Verify build completes
Change-Id: Ib263505d739b9a50c1295fd0a75ed9e59dcb3acb
parent e0250db7

core/api/current.txt

+6 −6
Original line number Diff line number Diff line
@@ -2048,16 +2048,16 @@ 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_dim_dark;

    field public static final int system_primary_fixed_dim_light;

    field public static final int system_primary_fixed_light;

    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_dim_dark;

    field public static final int system_secondary_fixed_dim_light;

    field public static final int system_secondary_fixed_light;

    field public static final int system_secondary_light;

    field public static final int system_surface_bright_dark;
@@ -2082,8 +2082,8 @@ 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_dim_dark;

    field public static final int system_tertiary_fixed_dim_light;

    field public static final int system_tertiary_fixed_light;

    field public static final int system_tertiary_light;

    field public static final int system_text_hint_inverse_dark;

core/res/res/values/colors.xml

+6 −6
Original line number Diff line number Diff line
@@ -470,15 +470,15 @@ 
    <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_primary_fixed_dim_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_secondary_fixed_dim_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_tertiary_fixed_dim_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>
@@ -525,15 +525,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_fixed_darker_dark">#ADC6FF</color>

    <color name="system_primary_fixed_dim_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_fixed_darker_dark">#BFC6DC</color>

    <color name="system_secondary_fixed_dim_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_fixed_darker_dark">#DEBCDF</color>

    <color name="system_tertiary_fixed_dim_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

+6 −6
Original line number Diff line number Diff line
@@ -187,15 +187,15 @@ 
    <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_primary_fixed_dim_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_secondary_fixed_dim_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_tertiary_fixed_dim_light" />

    <public name="system_on_tertiary_fixed_light" />

    <public name="system_on_tertiary_fixed_variant_light" />

    <public name="system_control_activated_light" />
@@ -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_fixed_darker_dark"/>

    <public name="system_primary_fixed_dim_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_fixed_darker_dark"/>

    <public name="system_secondary_fixed_dim_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_fixed_darker_dark"/>

    <public name="system_tertiary_fixed_dim_dark"/>

    <public name="system_on_tertiary_fixed_dark"/>

    <public name="system_on_tertiary_fixed_variant_dark"/>

    <public name="system_control_activated_dark"/>

packages/SystemUI/monet/src/com/android/systemui/monet/dynamiccolor/MaterialDynamicColors.java

+9 −9
Original line number Diff line number Diff line
@@ -252,49 +252,49 @@ public final class MaterialDynamicColors { 
            DynamicColor.fromPalette((s) -> s.primaryPalette, (s) -> 90.0,

                    (s) -> highestSurface(s));



    public static final DynamicColor primaryFixedDarker =

    public static final DynamicColor primaryFixedDim =

            DynamicColor.fromPalette((s) -> s.primaryPalette, (s) -> 80.0,

                    (s) -> highestSurface(s));



    public static final DynamicColor onPrimaryFixed =

            DynamicColor.fromPalette((s) -> s.primaryPalette, (s) -> 10.0,

                    (s) -> primaryFixedDarker);

                    (s) -> primaryFixedDim);



    public static final DynamicColor onPrimaryFixedVariant =

            DynamicColor.fromPalette((s) -> s.primaryPalette, (s) -> 30.0,

                    (s) -> primaryFixedDarker);

                    (s) -> primaryFixedDim);



    public static final DynamicColor secondaryFixed =

            DynamicColor.fromPalette((s) -> s.secondaryPalette, (s) -> 90.0,

                    (s) -> highestSurface(s));



    public static final DynamicColor secondaryFixedDarker =

    public static final DynamicColor secondaryFixedDim =

            DynamicColor.fromPalette((s) -> s.secondaryPalette, (s) -> 80.0,

                    (s) -> highestSurface(s));



    public static final DynamicColor onSecondaryFixed =

            DynamicColor.fromPalette((s) -> s.secondaryPalette, (s) -> 10.0,

                    (s) -> secondaryFixedDarker);

                    (s) -> secondaryFixedDim);



    public static final DynamicColor onSecondaryFixedVariant =

            DynamicColor.fromPalette((s) -> s.secondaryPalette, (s) -> 30.0,

                    (s) -> secondaryFixedDarker);

                    (s) -> secondaryFixedDim);



    public static final DynamicColor tertiaryFixed =

            DynamicColor.fromPalette((s) -> s.tertiaryPalette, (s) -> 90.0,

                    (s) -> highestSurface(s));



    public static final DynamicColor tertiaryFixedDarker =

    public static final DynamicColor tertiaryFixedDim =

            DynamicColor.fromPalette((s) -> s.tertiaryPalette, (s) -> 80.0,

                    (s) -> highestSurface(s));



    public static final DynamicColor onTertiaryFixed =

            DynamicColor.fromPalette((s) -> s.tertiaryPalette, (s) -> 10.0,

                    (s) -> tertiaryFixedDarker);

                    (s) -> tertiaryFixedDim);



    public static final DynamicColor onTertiaryFixedVariant =

            DynamicColor.fromPalette((s) -> s.tertiaryPalette, (s) -> 30.0,

                    (s) -> tertiaryFixedDarker);

                    (s) -> tertiaryFixedDim);



    /**

     * These colors were present in Android framework before Android U, and used by MDC controls.

packages/SystemUI/src/com/android/systemui/theme/DynamicColors.kt

+3 −3
Original line number Diff line number Diff line
@@ -55,15 +55,15 @@ class DynamicColors { 
                Pair.create("error_container", MDC.errorContainer),

                Pair.create("on_error_container", MDC.onErrorContainer),

                Pair.create("primary_fixed", MDC.primaryFixed),

                Pair.create("primary_fixed_darker", MDC.primaryFixedDarker),

                Pair.create("primary_fixed_dim", MDC.primaryFixedDim),

                Pair.create("on_primary_fixed", MDC.onPrimaryFixed),

                Pair.create("on_primary_fixed_variant", MDC.onPrimaryFixedVariant),

                Pair.create("secondary_fixed", MDC.secondaryFixed),

                Pair.create("secondary_fixed_darker", MDC.secondaryFixedDarker),

                Pair.create("secondary_fixed_dim", MDC.secondaryFixedDim),

                Pair.create("on_secondary_fixed", MDC.onSecondaryFixed),

                Pair.create("on_secondary_fixed_variant", MDC.onSecondaryFixedVariant),

                Pair.create("tertiary_fixed", MDC.tertiaryFixed),

                Pair.create("tertiary_fixed_darker", MDC.tertiaryFixedDarker),

                Pair.create("tertiary_fixed_dim", MDC.tertiaryFixedDim),

                Pair.create("on_tertiary_fixed", MDC.onTertiaryFixed),

                Pair.create("on_tertiary_fixed_variant", MDC.onTertiaryFixedVariant),

                Pair.create("control_activated", MDC.controlActivated),