diff --git a/core/res/res/color/control_nodisable_material.xml b/core/res/res/color/config_progress_background_tint.xml similarity index 93% rename from core/res/res/color/control_nodisable_material.xml rename to core/res/res/color/config_progress_background_tint.xml index 4a73e93a946c7..b086e20bf1619 100644 --- a/core/res/res/color/control_nodisable_material.xml +++ b/core/res/res/color/config_progress_background_tint.xml @@ -1,5 +1,5 @@ - + + + diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 979a0d6c68080..fa0fb9461ef02 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2457,6 +2457,7 @@ + diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index cb11d8d7e6717..fdbcd8a27f912 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -127,6 +127,7 @@ easier. @style/Widget.DeviceDefault.ProgressBar.Small.Inverse @style/Widget.DeviceDefault.ProgressBar.Large.Inverse @dimen/config_progressBarCornerRadius + @color/config_progress_background_tint @style/Widget.DeviceDefault.SeekBar @style/Widget.DeviceDefault.RatingBar @style/Widget.DeviceDefault.RatingBar.Indicator @@ -230,6 +231,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -253,6 +255,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -278,6 +281,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -302,6 +306,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -334,6 +339,7 @@ easier. @style/Theme.DeviceDefault.Dialog.Alert + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -357,6 +363,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -379,6 +386,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -402,6 +410,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -441,6 +450,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -465,6 +475,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -487,6 +498,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -511,6 +523,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -534,6 +547,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -557,6 +571,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -580,6 +595,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -603,6 +619,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -626,6 +643,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -647,6 +665,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -668,6 +687,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -748,6 +768,7 @@ easier. @style/Widget.DeviceDefault.Light.ProgressBar.Small.Inverse @style/Widget.DeviceDefault.Light.ProgressBar.Large.Inverse @dimen/config_progressBarCornerRadius + @color/config_progress_background_tint @style/Widget.DeviceDefault.Light.SeekBar @style/Widget.DeviceDefault.Light.RatingBar @style/Widget.DeviceDefault.Light.RatingBar.Indicator @@ -846,6 +867,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -868,6 +890,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -891,6 +914,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -916,6 +940,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -940,6 +965,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -970,6 +996,7 @@ easier. @color/accent_device_default_light + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -993,6 +1020,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1015,6 +1043,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1038,6 +1067,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1087,6 +1117,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1111,6 +1142,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1133,6 +1165,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1157,6 +1190,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1180,6 +1214,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1201,6 +1236,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1222,6 +1258,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1256,6 +1293,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1278,6 +1316,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1290,6 +1329,7 @@ easier. @style/Theme.DeviceDefault.Light.Dialog.Alert + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1313,6 +1353,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1335,6 +1376,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1357,6 +1399,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1379,6 +1422,7 @@ easier. @style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius @@ -1408,6 +1452,7 @@ easier. @color/accent_device_default_light + @color/config_progress_background_tint @dimen/config_progressBarCornerRadius diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml index 76d9ea6cd94e1..9b633fc94a8f3 100644 --- a/core/res/res/values/themes_material.xml +++ b/core/res/res/values/themes_material.xml @@ -403,6 +403,7 @@ please see themes_device_defaults.xml. @color/ripple_material_dark @color/btn_default_material_dark @color/switch_thumb_material_dark + ?attr/colorControlNormal @color/foreground_material_light @@ -777,6 +778,7 @@ please see themes_device_defaults.xml. @color/ripple_material_light @color/btn_default_material_light @color/switch_thumb_material_light + ?attr/colorControlNormal @color/foreground_material_dark @@ -837,6 +839,7 @@ please see themes_device_defaults.xml. @color/ripple_material_light @color/btn_default_material_light @color/switch_thumb_material_light + ?attr/colorControlNormal