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

Commit 4694310c authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Automerger Merge Worker
Browse files

Merge "Revert "Added missing outlineVariant token from Material"" into udc-dev am: 27e18575 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22140535



Change-Id: I2b438e77b8474e28445cb1d7e8d4b1da2e961273
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 537d96af 27e18575

core/api/current.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -2037,8 +2037,6 @@ package android { 
    field public static final int system_on_tertiary_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_dark;

    field public static final int system_outline_light;

    field public static final int system_outline_light;

    field public static final int system_outline_variant_dark;

    field public static final int system_outline_variant_light;

    field public static final int system_palette_key_color_neutral_dark;

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

    field public static final int system_palette_key_color_neutral_variant_dark;

    field public static final int system_palette_key_color_neutral_variant_dark;

core/res/res/values/attrs.xml

+5 −11
Original line number Original line Diff line number Diff line
@@ -1312,21 +1312,15 @@ 
        <!-- The container color of surface the most elevated, which replaces the previous surface

        <!-- The container color of surface the most elevated, which replaces the previous surface

             variant. @hide -->

             variant. @hide -->

        <attr name="materialColorSurfaceContainerHighest" format="color"/>

        <attr name="materialColorSurfaceContainerHighest" format="color"/>

        <!-- A tonal variation of the on surface color that passes accessibility guidelines for

        <!-- undefined @hide -->

             text/iconography when drawn on top of surface variant. @hide -->

        <attr name="materialColorOnSurfaceVariant" format="color"/>

        <attr name="materialColorOnSurfaceVariant" format="color"/>

        <!-- A color meant to be used in element outlines. @hide -->

        <!-- undefined @hide -->

        <attr name="materialColorOutline" format="color"/>

        <attr name="materialColorOutline" format="color"/>

        <!-- A color meant to be used in element outlines on the surface-variant color. @hide -->

        <!-- undefined @hide -->

        <attr name="materialColorOutlineVariant" format="color"/>

        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of

             primary. @hide -->

        <attr name="materialColorOnPrimary" format="color"/>

        <attr name="materialColorOnPrimary" format="color"/>

        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of

        <!-- undefined @hide -->

             surface. @hide -->

        <attr name="materialColorOnSurface" format="color"/>

        <attr name="materialColorOnSurface" format="color"/>

        <!-- The container color of surface, which replaces the previous surface at elevation level

        <!-- undefined @hide -->

             2. @hide -->

        <attr name="materialColorSurfaceContainer" format="color"/>

        <attr name="materialColorSurfaceContainer" format="color"/>

        <!-- The container color of surface, which replaces the previous surface at elevation level

        <!-- The container color of surface, which replaces the previous surface at elevation level

             2. @hide -->

             2. @hide -->

core/res/res/values/colors.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -465,7 +465,6 @@ 
    <color name="system_surface_variant_light">#E1E2EC</color>

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

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

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

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

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

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

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

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

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

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

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

    <color name="system_error_container_light">#FFDAD5</color>
@@ -521,7 +520,6 @@ 
    <color name="system_surface_variant_dark">#44474F</color>

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

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

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

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

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

    <color name="system_outline_variant_dark">#444746</color>

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

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

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

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

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

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

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

+0 −14
Original line number Original line Diff line number Diff line
@@ -269,20 +269,6 @@ 
    <public name="system_palette_key_color_tertiary_dark"/>

    <public name="system_palette_key_color_tertiary_dark"/>

    <public name="system_palette_key_color_neutral_dark"/>

    <public name="system_palette_key_color_neutral_dark"/>

    <public name="system_palette_key_color_neutral_variant_dark"/>

    <public name="system_palette_key_color_neutral_variant_dark"/>

    <public name="system_primary_fixed" />

    <public name="system_primary_fixed_dim" />

    <public name="system_on_primary_fixed" />

    <public name="system_on_primary_fixed_variant" />

    <public name="system_secondary_fixed" />

    <public name="system_secondary_fixed_dim" />

    <public name="system_on_secondary_fixed" />

    <public name="system_on_secondary_fixed_variant" />

    <public name="system_tertiary_fixed" />

    <public name="system_tertiary_fixed_dim" />

    <public name="system_on_tertiary_fixed" />

    <public name="system_on_tertiary_fixed_variant" />

    <public name="system_outline_variant_light" />

    <public name="system_outline_variant_dark" />

  </staging-public-group>

  </staging-public-group>





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

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

core/res/res/values/symbols.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -5026,7 +5026,6 @@ 
  <java-symbol name="materialColorSurfaceContainerHighest" type="attr"/>

  <java-symbol name="materialColorSurfaceContainerHighest" type="attr"/>

  <java-symbol name="materialColorOnSurfaceVariant" type="attr"/>

  <java-symbol name="materialColorOnSurfaceVariant" type="attr"/>

  <java-symbol name="materialColorOutline" type="attr"/>

  <java-symbol name="materialColorOutline" type="attr"/>

  <java-symbol name="materialColorOutlineVariant" type="attr"/>

  <java-symbol name="materialColorOnPrimary" type="attr"/>

  <java-symbol name="materialColorOnPrimary" type="attr"/>

  <java-symbol name="materialColorOnSurface" type="attr"/>

  <java-symbol name="materialColorOnSurface" type="attr"/>

  <java-symbol name="materialColorSurfaceContainer" type="attr"/>

  <java-symbol name="materialColorSurfaceContainer" type="attr"/>