From d32de87613cb3f7d0efacc04f344b1e14c9bc54c Mon Sep 17 00:00:00 2001 From: Marcelo Arteiro Date: Tue, 4 Apr 2023 14:44:30 +0000 Subject: [PATCH] Fixing Material Tokens inheriting wrong theme Bug: 271951574 Test: Manual Change-Id: I235af7899bc814a2910e6196c2f195ebc711d6bb --- .../res/res/values/themes_device_defaults.xml | 248 +++++++++--------- 1 file changed, 124 insertions(+), 124 deletions(-) diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index a64bb21ad53a8..e59b2597722fe 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -4034,47 +4034,47 @@ easier. @color/system_on_secondary_fixed_variant @color/system_on_tertiary_fixed_variant - @color/system_surface_container_lowest_dark + @color/system_surface_container_lowest_light @color/system_on_primary_fixed_variant - @color/system_on_secondary_container_dark - @color/system_on_tertiary_container_dark - @color/system_surface_container_low_dark - @color/system_on_primary_container_dark + @color/system_on_secondary_container_light + @color/system_on_tertiary_container_light + @color/system_surface_container_low_light + @color/system_on_primary_container_light @color/system_secondary_fixed_dim - @color/system_on_error_container_dark + @color/system_on_error_container_light @color/system_on_secondary_fixed - @color/system_on_surface_dark + @color/system_on_surface_light @color/system_tertiary_fixed_dim @color/system_on_tertiary_fixed @color/system_primary_fixed_dim - @color/system_secondary_container_dark - @color/system_error_container_dark + @color/system_secondary_container_light + @color/system_error_container_light @color/system_on_primary_fixed - @color/system_primary_dark + @color/system_primary_light @color/system_secondary_fixed - @color/system_surface_dark - @color/system_surface_variant_dark - @color/system_tertiary_container_dark + @color/system_surface_light + @color/system_surface_variant_light + @color/system_tertiary_container_light @color/system_tertiary_fixed - @color/system_primary_container_dark - @color/system_on_background_dark + @color/system_primary_container_light + @color/system_on_background_light @color/system_primary_fixed - @color/system_on_secondary_dark - @color/system_on_tertiary_dark - @color/system_surface_dim_dark - @color/system_surface_bright_dark - @color/system_secondary_dark - @color/system_on_error_dark - @color/system_surface_dark - @color/system_surface_container_high_dark - @color/system_tertiary_dark - @color/system_surface_container_highest_dark - @color/system_on_surface_variant_dark - @color/system_outline_dark - @color/system_outline_variant_dark - @color/system_on_primary_dark - @color/system_on_surface_dark - @color/system_surface_container_dark + @color/system_on_secondary_light + @color/system_on_tertiary_light + @color/system_surface_dim_light + @color/system_surface_bright_light + @color/system_secondary_light + @color/system_on_error_light + @color/system_surface_light + @color/system_surface_container_high_light + @color/system_tertiary_light + @color/system_surface_container_highest_light + @color/system_on_surface_variant_light + @color/system_outline_light + @color/system_outline_variant_light + @color/system_on_primary_light + @color/system_on_surface_light + @color/system_surface_container_light @@ -4114,47 +4114,47 @@ easier. @color/system_on_secondary_fixed_variant @color/system_on_tertiary_fixed_variant - @color/system_surface_container_lowest_dark + @color/system_surface_container_lowest_light @color/system_on_primary_fixed_variant - @color/system_on_secondary_container_dark - @color/system_on_tertiary_container_dark - @color/system_surface_container_low_dark - @color/system_on_primary_container_dark + @color/system_on_secondary_container_light + @color/system_on_tertiary_container_light + @color/system_surface_container_low_light + @color/system_on_primary_container_light @color/system_secondary_fixed_dim - @color/system_on_error_container_dark + @color/system_on_error_container_light @color/system_on_secondary_fixed - @color/system_on_surface_dark + @color/system_on_surface_light @color/system_tertiary_fixed_dim @color/system_on_tertiary_fixed @color/system_primary_fixed_dim - @color/system_secondary_container_dark - @color/system_error_container_dark + @color/system_secondary_container_light + @color/system_error_container_light @color/system_on_primary_fixed - @color/system_primary_dark + @color/system_primary_light @color/system_secondary_fixed - @color/system_surface_dark - @color/system_surface_variant_dark - @color/system_tertiary_container_dark + @color/system_surface_light + @color/system_surface_variant_light + @color/system_tertiary_container_light @color/system_tertiary_fixed - @color/system_primary_container_dark - @color/system_on_background_dark + @color/system_primary_container_light + @color/system_on_background_light @color/system_primary_fixed - @color/system_on_secondary_dark - @color/system_on_tertiary_dark - @color/system_surface_dim_dark - @color/system_surface_bright_dark - @color/system_secondary_dark - @color/system_on_error_dark - @color/system_surface_dark - @color/system_surface_container_high_dark - @color/system_tertiary_dark - @color/system_surface_container_highest_dark - @color/system_on_surface_variant_dark - @color/system_outline_dark - @color/system_outline_variant_dark - @color/system_on_primary_dark - @color/system_on_surface_dark - @color/system_surface_container_dark + @color/system_on_secondary_light + @color/system_on_tertiary_light + @color/system_surface_dim_light + @color/system_surface_bright_light + @color/system_secondary_light + @color/system_on_error_light + @color/system_surface_light + @color/system_surface_container_high_light + @color/system_tertiary_light + @color/system_surface_container_highest_light + @color/system_on_surface_variant_light + @color/system_outline_light + @color/system_outline_variant_light + @color/system_on_primary_light + @color/system_on_surface_light + @color/system_surface_container_light @@ -4186,47 +4186,47 @@ easier. @color/system_on_secondary_fixed_variant @color/system_on_tertiary_fixed_variant - @color/system_surface_container_lowest_dark + @color/system_surface_container_lowest_light @color/system_on_primary_fixed_variant - @color/system_on_secondary_container_dark - @color/system_on_tertiary_container_dark - @color/system_surface_container_low_dark - @color/system_on_primary_container_dark + @color/system_on_secondary_container_light + @color/system_on_tertiary_container_light + @color/system_surface_container_low_light + @color/system_on_primary_container_light @color/system_secondary_fixed_dim - @color/system_on_error_container_dark + @color/system_on_error_container_light @color/system_on_secondary_fixed - @color/system_on_surface_dark + @color/system_on_surface_light @color/system_tertiary_fixed_dim @color/system_on_tertiary_fixed @color/system_primary_fixed_dim - @color/system_secondary_container_dark - @color/system_error_container_dark + @color/system_secondary_container_light + @color/system_error_container_light @color/system_on_primary_fixed - @color/system_primary_dark + @color/system_primary_light @color/system_secondary_fixed - @color/system_surface_dark - @color/system_surface_variant_dark - @color/system_tertiary_container_dark + @color/system_surface_light + @color/system_surface_variant_light + @color/system_tertiary_container_light @color/system_tertiary_fixed - @color/system_primary_container_dark - @color/system_on_background_dark + @color/system_primary_container_light + @color/system_on_background_light @color/system_primary_fixed - @color/system_on_secondary_dark - @color/system_on_tertiary_dark - @color/system_surface_dim_dark - @color/system_surface_bright_dark - @color/system_secondary_dark - @color/system_on_error_dark - @color/system_surface_dark - @color/system_surface_container_high_dark - @color/system_tertiary_dark - @color/system_surface_container_highest_dark - @color/system_on_surface_variant_dark - @color/system_outline_dark - @color/system_outline_variant_dark - @color/system_on_primary_dark - @color/system_on_surface_dark - @color/system_surface_container_dark + @color/system_on_secondary_light + @color/system_on_tertiary_light + @color/system_surface_dim_light + @color/system_surface_bright_light + @color/system_secondary_light + @color/system_on_error_light + @color/system_surface_light + @color/system_surface_container_high_light + @color/system_tertiary_light + @color/system_surface_container_highest_light + @color/system_on_surface_variant_light + @color/system_outline_light + @color/system_outline_variant_light + @color/system_on_primary_light + @color/system_on_surface_light + @color/system_surface_container_light @@ -4357,47 +4357,47 @@ easier. @color/system_on_secondary_fixed_variant @color/system_on_tertiary_fixed_variant - @color/system_surface_container_lowest_dark + @color/system_surface_container_lowest_light @color/system_on_primary_fixed_variant - @color/system_on_secondary_container_dark - @color/system_on_tertiary_container_dark - @color/system_surface_container_low_dark - @color/system_on_primary_container_dark + @color/system_on_secondary_container_light + @color/system_on_tertiary_container_light + @color/system_surface_container_low_light + @color/system_on_primary_container_light @color/system_secondary_fixed_dim - @color/system_on_error_container_dark + @color/system_on_error_container_light @color/system_on_secondary_fixed - @color/system_on_surface_dark + @color/system_on_surface_light @color/system_tertiary_fixed_dim @color/system_on_tertiary_fixed @color/system_primary_fixed_dim - @color/system_secondary_container_dark - @color/system_error_container_dark + @color/system_secondary_container_light + @color/system_error_container_light @color/system_on_primary_fixed - @color/system_primary_dark + @color/system_primary_light @color/system_secondary_fixed - @color/system_surface_dark - @color/system_surface_variant_dark - @color/system_tertiary_container_dark + @color/system_surface_light + @color/system_surface_variant_light + @color/system_tertiary_container_light @color/system_tertiary_fixed - @color/system_primary_container_dark - @color/system_on_background_dark + @color/system_primary_container_light + @color/system_on_background_light @color/system_primary_fixed - @color/system_on_secondary_dark - @color/system_on_tertiary_dark - @color/system_surface_dim_dark - @color/system_surface_bright_dark - @color/system_secondary_dark - @color/system_on_error_dark - @color/system_surface_dark - @color/system_surface_container_high_dark - @color/system_tertiary_dark - @color/system_surface_container_highest_dark - @color/system_on_surface_variant_dark - @color/system_outline_dark - @color/system_outline_variant_dark - @color/system_on_primary_dark - @color/system_on_surface_dark - @color/system_surface_container_dark + @color/system_on_secondary_light + @color/system_on_tertiary_light + @color/system_surface_dim_light + @color/system_surface_bright_light + @color/system_secondary_light + @color/system_on_error_light + @color/system_surface_light + @color/system_surface_container_high_light + @color/system_tertiary_light + @color/system_surface_container_highest_light + @color/system_on_surface_variant_light + @color/system_outline_light + @color/system_outline_variant_light + @color/system_on_primary_light + @color/system_on_surface_light + @color/system_surface_container_light