diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 4f920dac1bcfb..20a5d379cbcc0 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -255,7 +255,7 @@
#909090
- #777777
+ #757575
#5e5e5e
@@ -292,7 +292,7 @@
#1fa293
- #00877a
+ #008377
#006d61
diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml
index 7f3e177fb7b73..c8cccc45f634d 100644
--- a/core/res/res/values/colors_device_defaults.xml
+++ b/core/res/res/values/colors_device_defaults.xml
@@ -42,6 +42,13 @@
@color/system_main_900
@color/system_main_100
+ @color/system_main_900
+ @color/system_main_50
+ @color/system_main_700
+ @color/system_main_200
+ @color/system_main_500
+ @color/system_main_400
+
@color/error_color_material_dark
@color/error_color_material_light
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index dff6e874c9b0a..ee17f6f7ce219 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -219,6 +219,9 @@ easier.
- @color/background_floating_device_default_dark
- ?attr/colorBackgroundFloating
- ?attr/colorBackgroundFloating
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
@@ -230,6 +233,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -258,6 +264,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -288,6 +297,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -317,6 +329,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -363,6 +378,9 @@ easier.
- @color/error_color_device_default_dark
- @color/background_device_default_dark
- @color/background_floating_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -384,6 +402,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -411,6 +432,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -439,6 +463,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -483,6 +510,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -512,6 +542,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -539,6 +572,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -568,6 +604,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -596,6 +635,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -624,6 +666,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -652,6 +697,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -680,6 +728,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -712,6 +763,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @style/TextAppearance.DeviceDefault.Widget.Button
@@ -741,6 +795,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -767,6 +824,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -949,6 +1009,9 @@ easier.
- @color/error_color_device_default_light
- @color/background_device_default_light
- @color/background_floating_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- ?attr/colorBackgroundFloating
- ?attr/colorBackgroundFloating
@@ -961,6 +1024,9 @@ easier.
- @color/primary_dark_device_default_dark
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -988,6 +1054,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1016,6 +1085,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1046,6 +1118,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1075,6 +1150,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1123,6 +1201,9 @@ easier.
- @color/error_color_device_default_light
- @color/background_device_default_light
- @color/background_floating_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @color/config_progress_background_tint
@@ -1143,6 +1224,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1173,6 +1257,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1204,6 +1291,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1236,6 +1326,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
@@ -1250,6 +1343,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1295,6 +1394,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1325,6 +1427,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1354,6 +1459,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1382,6 +1490,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1410,6 +1521,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1436,6 +1550,9 @@ easier.
- @color/primary_dark_device_default_light
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1552,6 +1669,9 @@ easier.
- @color/secondary_device_default_settings
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
+ - @color/text_color_primary_device_default_dark
+ - @color/text_color_secondary_device_default_dark
+ - @color/text_color_tertiary_device_default_dark
- @dimen/config_dialogCornerRadius
@@ -1579,6 +1699,9 @@ easier.
- @color/secondary_device_default_settings
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @style/Theme.DeviceDefault.Light.Dialog.Alert
@@ -1616,6 +1739,9 @@ easier.
- @color/secondary_device_default_settings
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius
@@ -1646,6 +1772,9 @@ easier.
- @color/secondary_device_default_settings
- @color/accent_device_default_light
- @color/error_color_device_default_light
+ - @color/text_color_primary_device_default_light
+ - @color/text_color_secondary_device_default_light
+ - @color/text_color_tertiary_device_default_light
- @dimen/config_dialogCornerRadius