From 43709e1790b0e04a9fc1b8f1c41bd90cc3801d06 Mon Sep 17 00:00:00 2001 From: Marcelo Arteiro Date: Mon, 13 Mar 2023 14:20:40 +0000 Subject: [PATCH] Added missing outlineVariant token from Material Test: atest ColorTest Bug: 271275083 (cherry picked from commit c7b5a2b25f63ad7e77404b63142fe80806c346cb) Change-Id: Ife4a1b4c9650f7883ef1673cdc8e0a9f491a0c5e --- core/res/res/values/attrs.xml | 16 +++++-- core/res/res/values/symbols.xml | 1 + .../res/res/values/themes_device_defaults.xml | 47 +++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 602f486fef65a..cd25726ac7306 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1316,15 +1316,21 @@ - + - + - + + + - + - + diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index c60029e6671c9..7b582da836aa0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -5042,6 +5042,7 @@ + diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index 6b041dd06c27d..147d74e746873 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 @@ -371,6 +372,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 @@ -463,6 +465,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 @@ -557,6 +560,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 @@ -650,6 +654,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 @@ -751,6 +756,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 @@ -843,6 +849,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 @@ -934,6 +941,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 @@ -1026,6 +1034,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 @@ -1134,6 +1143,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 @@ -1227,6 +1237,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 @@ -1318,6 +1329,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 @@ -1411,6 +1423,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 @@ -1503,6 +1516,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 @@ -1595,6 +1609,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 @@ -1687,6 +1702,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 @@ -1779,6 +1795,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 @@ -1871,6 +1888,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 @@ -1968,6 +1986,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 @@ -2058,6 +2077,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 @@ -2286,6 +2306,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 @@ -2378,6 +2399,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 @@ -2469,6 +2491,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 @@ -2561,6 +2584,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 @@ -2655,6 +2679,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 @@ -2748,6 +2773,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 @@ -2847,6 +2873,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 @@ -2942,6 +2969,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 @@ -3036,6 +3064,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 @@ -3131,6 +3160,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 @@ -3207,6 +3237,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 @@ -3283,6 +3314,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 @@ -3378,6 +3410,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 @@ -3474,6 +3507,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 @@ -3568,6 +3602,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 @@ -3661,6 +3696,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 @@ -3753,6 +3789,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 @@ -3845,6 +3882,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 @@ -3935,6 +3973,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 @@ -4281,6 +4320,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 @@ -4475,6 +4515,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 @@ -4569,6 +4610,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 @@ -4689,6 +4731,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 @@ -4740,6 +4783,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 @@ -4794,6 +4838,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 @@ -4844,6 +4889,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 @@ -4905,6 +4951,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