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

Commit d2b13f41 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Adding Material Color Tokens to Android" into udc-dev

parents 00abedf6 3a574b4b
Loading
Loading
Loading
Loading
+116 −0
Original line number Diff line number Diff line
@@ -1210,6 +1210,122 @@
             a value of 'true' will not override any 'false' value in its parent chain nor will
             it prevent any 'false' in any of its children. -->
        <attr name="forceDarkAllowed" format="boolean" />
        <!-- A lower-emphasized variant of the color on the fixed secondary branding color. @hide
             -->
        <attr name="materialColorOnSecondaryFixedVariant" format="color"/>
        <!-- A lower-emphasized variant of the color on the fixed tertiary branding color. @hide
             -->
        <attr name="materialColorOnTertiaryFixedVariant" format="color"/>
        <!-- The container color of surface the most lowered. @hide -->
        <attr name="materialColorSurfaceContainerLowest" format="color"/>
        <!-- A lower-emphasized variant of the color on the fixed primary branding color. @hide -->
        <attr name="materialColorOnPrimaryFixedVariant" format="color"/>
        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
             the secondary container color. @hide -->
        <attr name="materialColorOnSecondaryContainer" format="color"/>
        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
             the tertiary container color. @hide -->
        <attr name="materialColorOnTertiaryContainer" format="color"/>
        <!-- The container color of surface slightly lowered, which replaces the previous surface
             at elevation level 1. @hide -->
        <attr name="materialColorSurfaceContainerLow" format="color"/>
        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
             the primary container color. @hide -->
        <attr name="materialColorOnPrimaryContainer" format="color"/>
        <!-- A stronger, more emphasized variant of the fixed secondary branding color. @hide -->
        <attr name="materialColorSecondaryFixedDim" format="color"/>
        <!-- A tonal variation of the on error color that passes accessibility guidelines for
             text/iconography when drawn on top of error container. @hide -->
        <attr name="materialColorOnErrorContainer" format="color"/>
        <!-- The color text/iconography when drawn on top of the fixed secondary branding color.
             @hide -->
        <attr name="materialColorOnSecondaryFixed" format="color"/>
        <!-- The "on surface" inverse color, useful for inverted backgrounds. @hide -->
        <attr name="materialColorOnSurfaceInverse" format="color"/>
        <!-- A stronger, more emphasized variant of the fixed tertiary branding color. @hide -->
        <attr name="materialColorTertiaryFixedDim" format="color"/>
        <!-- The color text/iconography when drawn on top of the fixed tertiary branding color.
             @hide -->
        <attr name="materialColorOnTertiaryFixed" format="color"/>
        <!-- A stronger, more emphasized variant of the fixed primary branding color. @hide -->
        <attr name="materialColorPrimaryFixedDim" format="color"/>
        <!-- A tonal variation of the secondary color suitable for background color of container
             views. @hide -->
        <attr name="materialColorSecondaryContainer" format="color"/>
        <!-- A tonal variation of the error color suitable for background color of container views.
             @hide -->
        <attr name="materialColorErrorContainer" format="color"/>
        <!-- The color text/iconography when drawn on top of the fixed primary branding color.
             @hide -->
        <attr name="materialColorOnPrimaryFixed" format="color"/>
        <!-- The inverse color of colorPrimary. @hide -->
        <attr name="materialColorPrimaryInverse" format="color"/>
        <!-- A secondary branding color for the app, which stays the same between light and dark
             themes. @hide -->
        <attr name="materialColorSecondaryFixed" format="color"/>
        <!-- The surface inverse color, useful for inverted backgrounds. @hide -->
        <attr name="materialColorSurfaceInverse" format="color"/>
        <!-- A tonal variation of the surface color. @hide -->
        <attr name="materialColorSurfaceVariant" format="color"/>
        <!-- A tonal variation of the tertiary color suitable for background color of container
             views. @hide -->
        <attr name="materialColorTertiaryContainer" format="color"/>
        <!-- A tertiary branding color for the app, which stays the same between light and dark
             themes. @hide -->
        <attr name="materialColorTertiaryFixed" format="color"/>
        <!-- A tonal variation of the primary color suitable for background color of container
             views. @hide -->
        <attr name="materialColorPrimaryContainer" format="color"/>
        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
             background. @hide -->
        <attr name="materialColorOnBackground" format="color"/>
        <!-- A primary branding color for the app, which stays the same between light and dark
             themes. @hide -->
        <attr name="materialColorPrimaryFixed" format="color"/>
        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
             secondary. @hide -->
        <attr name="materialColorOnSecondary" format="color"/>
        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
             tertiary. @hide -->
        <attr name="materialColorOnTertiary" format="color"/>
        <!-- The surface color which always stay the dimmest in either dark or light theme. @hide
             -->
        <attr name="materialColorSurfaceDim" format="color"/>
        <!-- The surface color which always stay the brightest in either dark or light theme. @hide
             -->
        <attr name="materialColorSurfaceBright" format="color"/>
        <!-- The secondary branding color for the app, usually a bright complement to the primary
             branding color. @hide -->
        <attr name="materialColorSecondary" format="color"/>
        <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
             error. @hide -->
        <attr name="materialColorOnError" format="color"/>
        <!-- The color of surfaces such as cards, sheets, menus. @hide -->
        <attr name="materialColorSurface" format="color"/>
        <!-- The container color of surface slightly elevated, which replaces the previous surface
             at elevation level 3. @hide -->
        <attr name="materialColorSurfaceContainerHigh" format="color"/>
        <!-- The tertiary branding color for the app, usually a bright complement to the primary
             branding color. @hide -->
        <attr name="materialColorTertiary" format="color"/>
        <!-- The container color of surface the most elevated, which replaces the previous surface
             variant. @hide -->
        <attr name="materialColorSurfaceContainerHighest" format="color"/>
        <!-- undefined @hide -->
        <attr name="materialColorOnSurfaceVariant" format="color"/>
        <!-- undefined @hide -->
        <attr name="materialColorOutline" format="color"/>
        <!-- undefined @hide -->
        <attr name="materialColorOnPrimary" format="color"/>
        <!-- undefined @hide -->
        <attr name="materialColorOnSurface" format="color"/>
        <!-- undefined @hide -->
        <attr name="materialColorSurfaceContainer" format="color"/>
        <!-- The container color of surface, which replaces the previous surface at elevation level
             2. @hide -->
        <attr name="materialColorSurfaceContainer" format="color"/>
    </declare-styleable>
    <!-- **************************************************************** -->
+2295 −0

File changed.

Preview size limit exceeded, changes collapsed.