diff --git a/core/api/current.txt b/core/api/current.txt
index dcdfc7af43799..d0cdd909a0274 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -2033,6 +2033,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 000e5b2a77124..c34f670f108e9 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 692011b5d519b..42ccfbe2148ba 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 9d5a2bc717b4e..9cbf3b6798515 100644
--- a/core/res/res/values/public-staging.xml
+++ b/core/res/res/values/public-staging.xml
@@ -283,6 +283,8 @@
+
+
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index af8cb8dc5985b..cf34e6afd9310 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -5025,6 +5025,7 @@
+
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 80df1f4392cba..2e3d145130a8d 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
@@ -372,6 +373,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
@@ -465,6 +467,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
@@ -560,6 +563,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
@@ -654,6 +658,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
@@ -756,6 +761,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
@@ -849,6 +855,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
@@ -941,6 +948,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
@@ -1034,6 +1042,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
@@ -1143,6 +1152,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
@@ -1237,6 +1247,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
@@ -1329,6 +1340,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
@@ -1423,6 +1435,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
@@ -1516,6 +1529,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
@@ -1609,6 +1623,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
@@ -1702,6 +1717,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
@@ -1795,6 +1811,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
@@ -1888,6 +1905,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
@@ -1986,6 +2004,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
@@ -2077,6 +2096,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
@@ -2306,6 +2326,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
@@ -2400,6 +2421,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
@@ -2493,6 +2515,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
@@ -2587,6 +2610,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
@@ -2683,6 +2707,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
@@ -2778,6 +2803,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
@@ -2879,6 +2905,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
@@ -2976,6 +3003,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
@@ -3072,6 +3100,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
@@ -3169,6 +3198,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
@@ -3247,6 +3277,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
@@ -3325,6 +3356,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
@@ -3422,6 +3454,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
@@ -3520,6 +3553,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
@@ -3616,6 +3650,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
@@ -3711,6 +3746,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
@@ -3805,6 +3841,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
@@ -3899,6 +3936,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
@@ -3991,6 +4029,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
@@ -4090,6 +4129,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
@@ -4169,6 +4209,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
@@ -4240,6 +4281,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
@@ -4333,6 +4375,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
@@ -4410,6 +4453,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
@@ -4527,6 +4571,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
@@ -4622,6 +4667,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
@@ -4743,6 +4789,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
@@ -4794,6 +4841,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
@@ -4850,6 +4898,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
@@ -4901,6 +4950,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
@@ -4964,6 +5014,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