From 2f9e0663007dfb5cbce4c915c44248dabe1a3697 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 25 May 2021 13:20:48 -0700 Subject: [PATCH] Add textColorOnAccent Text color that can safely be used on top of colorAccentPrimary, colorAccentSecondary, and colorAccentTertiary. Bug: 188881649 Test: manual, on launcher Change-Id: If1b6d256c7767837ef0367bbb039ede35da51213 --- .../text_color_on_accent_device_default.xml | 22 ++++++++++ core/res/res/values/attrs.xml | 3 ++ core/res/res/values/symbols.xml | 1 + .../res/res/values/themes_device_defaults.xml | 43 +++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 core/res/res/color/text_color_on_accent_device_default.xml diff --git a/core/res/res/color/text_color_on_accent_device_default.xml b/core/res/res/color/text_color_on_accent_device_default.xml new file mode 100644 index 0000000000000..1379523258de1 --- /dev/null +++ b/core/res/res/color/text_color_on_accent_device_default.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index e975938d3f7fd..a5f505176d5d1 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1137,6 +1137,9 @@ + + + diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index d86c6e7270480..4da5859fa49b8 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4274,6 +4274,7 @@ + diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index 41bedb2ed43c9..97acd5b9bf1e5 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -232,6 +232,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -260,6 +261,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -305,6 +307,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -352,6 +355,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -398,6 +402,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -459,6 +464,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -497,6 +503,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -541,6 +548,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -586,6 +594,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -647,6 +656,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -693,6 +703,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -737,6 +748,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -783,6 +795,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -828,6 +841,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -873,6 +887,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -918,6 +933,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -963,6 +979,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1012,6 +1029,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -1058,6 +1076,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -1101,6 +1120,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -1298,6 +1318,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark ?attr/colorBackgroundFloating @@ -1327,6 +1348,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1371,6 +1393,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1416,6 +1439,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1463,6 +1487,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1509,6 +1534,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1572,6 +1598,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1609,6 +1636,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1656,6 +1684,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1704,6 +1733,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1751,6 +1781,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1780,6 +1811,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1810,6 +1842,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1859,6 +1892,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1906,6 +1940,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1952,6 +1987,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -1997,6 +2033,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -2042,6 +2079,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -2085,6 +2123,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -2246,6 +2285,7 @@ easier. @color/text_color_primary_device_default_dark @color/text_color_secondary_device_default_dark @color/text_color_tertiary_device_default_dark + @color/text_color_on_accent_device_default @color/foreground_device_default_dark @color/foreground_device_default_light @@ -2290,6 +2330,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -2344,6 +2385,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark @@ -2391,6 +2433,7 @@ easier. @color/text_color_primary_device_default_light @color/text_color_secondary_device_default_light @color/text_color_tertiary_device_default_light + @color/text_color_on_accent_device_default @color/foreground_device_default_light @color/foreground_device_default_dark