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

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

Merge "Added missing outlineVariant token from Material"

parents 87e1c2fe da5ef257

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2033,6 +2033,8 @@ package android { 
    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_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_light;

    field public static final int system_palette_key_color_neutral_variant_dark;

core/res/res/values/attrs.xml

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

             variant. @hide -->

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

        <!-- undefined @hide -->

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

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

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

        <!-- undefined @hide -->

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

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

        <!-- undefined @hide -->

        <!-- A color meant to be used in element outlines on the surface-variant color. @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"/>

        <!-- undefined @hide -->

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

             surface. @hide -->

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

        <!-- undefined @hide -->

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

             2. @hide -->

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

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

             2. @hide -->

core/res/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ 
    <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_outline_variant_light">#C4C7C5</color>

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

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

    <color name="system_error_container_light">#FFDAD5</color>
@@ -520,6 +521,7 @@ 
    <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_outline_variant_dark">#444746</color>

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

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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ 
    <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 type="array" first-id="0x01c80000">

core/res/res/values/symbols.xml

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

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

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

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

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

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

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