Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing Material Tokens inheriting wrong theme" into udc-dev

Browse Source
This commit is contained in:
Marcelo Arteiro
2023-04-05 00:08:57 +00:00
committed by Android (Google) Code Review
parent 5b420aa9ce d32de87613
commit 406f45f9d2
1 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

248
core/res/res/values/themes_device_defaults.xml
View File

@@ -4034,47 +4034,47 @@ easier.
<item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item>
<item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item>
<item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item>
<item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item>
<item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item>
<item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item>
<item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item>
<item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item>
<item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item>
<item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item>
<item name="materialColorErrorContainer">@color/system_error_container_dark</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item>
<item name="materialColorErrorContainer">@color/system_error_container_light</item>
<item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item>
<item name="materialColorPrimaryInverse">@color/system_primary_dark</item>
<item name="materialColorPrimaryInverse">@color/system_primary_light</item>
<item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item>
<item name="materialColorSurfaceInverse">@color/system_surface_dark</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item>
<item name="materialColorSurfaceInverse">@color/system_surface_light</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item>
<item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item>
<item name="materialColorOnBackground">@color/system_on_background_dark</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_light</item>
<item name="materialColorOnBackground">@color/system_on_background_light</item>
<item name="materialColorPrimaryFixed">@color/system_primary_fixed</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_dark</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item>
<item name="materialColorSecondary">@color/system_secondary_dark</item>
<item name="materialColorOnError">@color/system_on_error_dark</item>
<item name="materialColorSurface">@color/system_surface_dark</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item>
<item name="materialColorTertiary">@color/system_tertiary_dark</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item>
<item name="materialColorOutline">@color/system_outline_dark</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item>
<item name="materialColorOnPrimary">@color/system_on_primary_dark</item>
<item name="materialColorOnSurface">@color/system_on_surface_dark</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_light</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_light</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_light</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_light</item>
<item name="materialColorSecondary">@color/system_secondary_light</item>
<item name="materialColorOnError">@color/system_on_error_light</item>
<item name="materialColorSurface">@color/system_surface_light</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item>
<item name="materialColorTertiary">@color/system_tertiary_light</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item>
<item name="materialColorOutline">@color/system_outline_light</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_light</item>
<item name="materialColorOnPrimary">@color/system_on_primary_light</item>
<item name="materialColorOnSurface">@color/system_on_surface_light</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_light</item>
</style>
@@ -4114,47 +4114,47 @@ easier.
<item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item>
<item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item>
<item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item>
<item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item>
<item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item>
<item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item>
<item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item>
<item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item>
<item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item>
<item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item>
<item name="materialColorErrorContainer">@color/system_error_container_dark</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item>
<item name="materialColorErrorContainer">@color/system_error_container_light</item>
<item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item>
<item name="materialColorPrimaryInverse">@color/system_primary_dark</item>
<item name="materialColorPrimaryInverse">@color/system_primary_light</item>
<item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item>
<item name="materialColorSurfaceInverse">@color/system_surface_dark</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item>
<item name="materialColorSurfaceInverse">@color/system_surface_light</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item>
<item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item>
<item name="materialColorOnBackground">@color/system_on_background_dark</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_light</item>
<item name="materialColorOnBackground">@color/system_on_background_light</item>
<item name="materialColorPrimaryFixed">@color/system_primary_fixed</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_dark</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item>
<item name="materialColorSecondary">@color/system_secondary_dark</item>
<item name="materialColorOnError">@color/system_on_error_dark</item>
<item name="materialColorSurface">@color/system_surface_dark</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item>
<item name="materialColorTertiary">@color/system_tertiary_dark</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item>
<item name="materialColorOutline">@color/system_outline_dark</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item>
<item name="materialColorOnPrimary">@color/system_on_primary_dark</item>
<item name="materialColorOnSurface">@color/system_on_surface_dark</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_light</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_light</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_light</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_light</item>
<item name="materialColorSecondary">@color/system_secondary_light</item>
<item name="materialColorOnError">@color/system_on_error_light</item>
<item name="materialColorSurface">@color/system_surface_light</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item>
<item name="materialColorTertiary">@color/system_tertiary_light</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item>
<item name="materialColorOutline">@color/system_outline_light</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_light</item>
<item name="materialColorOnPrimary">@color/system_on_primary_light</item>
<item name="materialColorOnSurface">@color/system_on_surface_light</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_light</item>
</style>
@@ -4186,47 +4186,47 @@ easier.
<item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item>
<item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item>
<item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item>
<item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item>
<item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item>
<item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item>
<item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item>
<item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item>
<item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item>
<item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item>
<item name="materialColorErrorContainer">@color/system_error_container_dark</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item>
<item name="materialColorErrorContainer">@color/system_error_container_light</item>
<item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item>
<item name="materialColorPrimaryInverse">@color/system_primary_dark</item>
<item name="materialColorPrimaryInverse">@color/system_primary_light</item>
<item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item>
<item name="materialColorSurfaceInverse">@color/system_surface_dark</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item>
<item name="materialColorSurfaceInverse">@color/system_surface_light</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item>
<item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item>
<item name="materialColorOnBackground">@color/system_on_background_dark</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_light</item>
<item name="materialColorOnBackground">@color/system_on_background_light</item>
<item name="materialColorPrimaryFixed">@color/system_primary_fixed</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_dark</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item>
<item name="materialColorSecondary">@color/system_secondary_dark</item>
<item name="materialColorOnError">@color/system_on_error_dark</item>
<item name="materialColorSurface">@color/system_surface_dark</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item>
<item name="materialColorTertiary">@color/system_tertiary_dark</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item>
<item name="materialColorOutline">@color/system_outline_dark</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item>
<item name="materialColorOnPrimary">@color/system_on_primary_dark</item>
<item name="materialColorOnSurface">@color/system_on_surface_dark</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_light</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_light</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_light</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_light</item>
<item name="materialColorSecondary">@color/system_secondary_light</item>
<item name="materialColorOnError">@color/system_on_error_light</item>
<item name="materialColorSurface">@color/system_surface_light</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item>
<item name="materialColorTertiary">@color/system_tertiary_light</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item>
<item name="materialColorOutline">@color/system_outline_light</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_light</item>
<item name="materialColorOnPrimary">@color/system_on_primary_light</item>
<item name="materialColorOnSurface">@color/system_on_surface_light</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_light</item>
</style>
@@ -4357,47 +4357,47 @@ easier.
<item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item>
<item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item>
<item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item>
<item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item>
<item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item>
<item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item>
<item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item>
<item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item>
<item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item>
<item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item>
<item name="materialColorErrorContainer">@color/system_error_container_dark</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item>
<item name="materialColorErrorContainer">@color/system_error_container_light</item>
<item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item>
<item name="materialColorPrimaryInverse">@color/system_primary_dark</item>
<item name="materialColorPrimaryInverse">@color/system_primary_light</item>
<item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item>
<item name="materialColorSurfaceInverse">@color/system_surface_dark</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item>
<item name="materialColorSurfaceInverse">@color/system_surface_light</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item>
<item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item>
<item name="materialColorOnBackground">@color/system_on_background_dark</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_light</item>
<item name="materialColorOnBackground">@color/system_on_background_light</item>
<item name="materialColorPrimaryFixed">@color/system_primary_fixed</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_dark</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item>
<item name="materialColorSecondary">@color/system_secondary_dark</item>
<item name="materialColorOnError">@color/system_on_error_dark</item>
<item name="materialColorSurface">@color/system_surface_dark</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item>
<item name="materialColorTertiary">@color/system_tertiary_dark</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item>
<item name="materialColorOutline">@color/system_outline_dark</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item>
<item name="materialColorOnPrimary">@color/system_on_primary_dark</item>
<item name="materialColorOnSurface">@color/system_on_surface_dark</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_light</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_light</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_light</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_light</item>
<item name="materialColorSecondary">@color/system_secondary_light</item>
<item name="materialColorOnError">@color/system_on_error_light</item>
<item name="materialColorSurface">@color/system_surface_light</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item>
<item name="materialColorTertiary">@color/system_tertiary_light</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item>
<item name="materialColorOutline">@color/system_outline_light</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_light</item>
<item name="materialColorOnPrimary">@color/system_on_primary_light</item>
<item name="materialColorOnSurface">@color/system_on_surface_light</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_light</item>
</style>