diff --git a/core/api/current.txt b/core/api/current.txt index dd4f2134c3d2d..ff87a7a689b07 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -2036,6 +2036,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; diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 2a67b44d64162..41c8b4ab153bd 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1312,15 +1312,21 @@ - + - + - + + + - + - + diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 6b3c1558304fa..dc7565894f8f5 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -465,6 +465,7 @@ #E1E2EC #44474F #72747D + #C4C7C5 #C00003 #FFFFFF #FFDAD5 @@ -520,6 +521,7 @@ #44474F #C4C6D0 #72747D + #444746 #FFB4A8 #690001 #930001 diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml index 69d5feff2de9a..d868a0a32a545 100644 --- a/core/res/res/values/public-staging.xml +++ b/core/res/res/values/public-staging.xml @@ -269,6 +269,20 @@ + + + + + + + + + + + + + + diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index c10612e16acf5..e5ef3f8f89e8e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -5021,6 +5021,7 @@ + diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index 511e734a0994e..2986bdf59a51b 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -278,6 +278,7 @@ easier. @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 @@ -373,6 +374,7 @@ easier. @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 @@ -467,6 +469,7 @@ easier. @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 @@ -563,6 +566,7 @@ easier. @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 @@ -658,6 +662,7 @@ easier. @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 @@ -761,6 +766,7 @@ easier. @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 @@ -855,6 +861,7 @@ easier. @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 @@ -948,6 +955,7 @@ easier. @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 @@ -1042,6 +1050,7 @@ easier. @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 @@ -1152,6 +1161,7 @@ easier. @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 @@ -1247,6 +1257,7 @@ easier. @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 @@ -1340,6 +1351,7 @@ easier. @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 @@ -1435,6 +1447,7 @@ easier. @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 @@ -1529,6 +1542,7 @@ easier. @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 @@ -1623,6 +1637,7 @@ easier. @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 @@ -1717,6 +1732,7 @@ easier. @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 @@ -1811,6 +1827,7 @@ easier. @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 @@ -1905,6 +1922,7 @@ easier. @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 @@ -2004,6 +2022,7 @@ easier. @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 @@ -2096,6 +2115,7 @@ easier. @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 @@ -2326,6 +2346,7 @@ easier. @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 @@ -2420,6 +2441,7 @@ easier. @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 @@ -2513,6 +2535,7 @@ easier. @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 @@ -2607,6 +2630,7 @@ easier. @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 @@ -2703,6 +2727,7 @@ easier. @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 @@ -2798,6 +2823,7 @@ easier. @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 @@ -2899,6 +2925,7 @@ easier. @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 @@ -2996,6 +3023,7 @@ easier. @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 @@ -3092,6 +3120,7 @@ easier. @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 @@ -3189,6 +3218,7 @@ easier. @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 @@ -3267,6 +3297,7 @@ easier. @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 @@ -3345,6 +3376,7 @@ easier. @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 @@ -3442,6 +3474,7 @@ easier. @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 @@ -3540,6 +3573,7 @@ easier. @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 @@ -3636,6 +3670,7 @@ easier. @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 @@ -3731,6 +3766,7 @@ easier. @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 @@ -3825,6 +3861,7 @@ easier. @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 @@ -3919,6 +3956,7 @@ easier. @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 @@ -4011,6 +4049,7 @@ easier. @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 @@ -4110,6 +4149,7 @@ easier. @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 @@ -4190,6 +4230,7 @@ easier. @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 @@ -4262,6 +4303,7 @@ easier. @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 @@ -4356,6 +4398,7 @@ easier. @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 @@ -4434,6 +4477,7 @@ easier. @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 @@ -4552,6 +4596,7 @@ easier. @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 @@ -4648,6 +4693,7 @@ easier. @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 @@ -4770,6 +4816,7 @@ easier. @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 @@ -4822,6 +4869,7 @@ easier. @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 @@ -4878,6 +4926,7 @@ easier. @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 @@ -4930,6 +4979,7 @@ easier. @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 @@ -4993,6 +5043,7 @@ easier. @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