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