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

Commit 43709e17 authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Selim Cinek
Browse files

Added missing outlineVariant token from Material 

Test: atest ColorTest
Bug: 271275083

(cherry picked from commit c7b5a2b2)

Change-Id: Ife4a1b4c9650f7883ef1673cdc8e0a9f491a0c5e
parent b7de83fa

core/res/res/values/attrs.xml

+11 −5
Original line number Diff line number Diff line
@@ -1316,15 +1316,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/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -5042,6 +5042,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"/>

core/res/res/values/themes_device_defaults.xml

+47 −0

File changed.

Preview size limit exceeded, changes collapsed.