diff options
| -rw-r--r-- | packages/SystemUI/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/DualToneHandler.kt | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index db699242a061..de136de9dd5f 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -85,7 +85,7 @@ Contract: Pixel with fillColor blended over backgroundColor blended over translucent should equal to singleToneColor blended over translucent. --> <declare-styleable name="TonedIcon"> - <attr name="backgroundColor" format="integer" /> + <attr name="iconBackgroundColor" format="integer" /> <attr name="fillColor" format="integer" /> <attr name="singleToneColor" format="integer" /> <attr name="homeHandleColor" format="integer" /> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index ac9873938a29..57f1f3f1606c 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -404,19 +404,19 @@ </style> <style name="DualToneLightTheme"> - <item name="backgroundColor">@color/light_mode_icon_color_dual_tone_background</item> + <item name="iconBackgroundColor">@color/light_mode_icon_color_dual_tone_background</item> <item name="fillColor">@color/light_mode_icon_color_dual_tone_fill</item> <item name="singleToneColor">@color/light_mode_icon_color_single_tone</item> <item name="homeHandleColor">@color/navigation_bar_home_handle_light_color</item> </style> <style name="DualToneDarkTheme"> - <item name="backgroundColor">@color/dark_mode_icon_color_dual_tone_background</item> + <item name="iconBackgroundColor">@color/dark_mode_icon_color_dual_tone_background</item> <item name="fillColor">@color/dark_mode_icon_color_dual_tone_fill</item> <item name="singleToneColor">@color/dark_mode_icon_color_single_tone</item> <item name="homeHandleColor">@color/navigation_bar_home_handle_dark_color</item> </style> <style name="QSHeaderDarkTheme"> - <item name="backgroundColor">@color/dark_mode_qs_icon_color_dual_tone_background</item> + <item name="iconBackgroundColor">@color/dark_mode_qs_icon_color_dual_tone_background</item> <item name="fillColor">@color/dark_mode_qs_icon_color_dual_tone_fill</item> <item name="singleToneColor">@color/dark_mode_qs_icon_color_single_tone</item> </style> diff --git a/packages/SystemUI/src/com/android/systemui/DualToneHandler.kt b/packages/SystemUI/src/com/android/systemui/DualToneHandler.kt index fdc3229ab8d7..2b8d3e046ffa 100644 --- a/packages/SystemUI/src/com/android/systemui/DualToneHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/DualToneHandler.kt @@ -54,11 +54,11 @@ class DualToneHandler(context: Context) { Utils.getThemeAttr(context, R.attr.lightIconTheme)) darkColor = Color( Utils.getColorAttrDefaultColor(dualToneDarkTheme, R.attr.singleToneColor), - Utils.getColorAttrDefaultColor(dualToneDarkTheme, R.attr.backgroundColor), + Utils.getColorAttrDefaultColor(dualToneDarkTheme, R.attr.iconBackgroundColor), Utils.getColorAttrDefaultColor(dualToneDarkTheme, R.attr.fillColor)) lightColor = Color( Utils.getColorAttrDefaultColor(dualToneLightTheme, R.attr.singleToneColor), - Utils.getColorAttrDefaultColor(dualToneLightTheme, R.attr.backgroundColor), + Utils.getColorAttrDefaultColor(dualToneLightTheme, R.attr.iconBackgroundColor), Utils.getColorAttrDefaultColor(dualToneLightTheme, R.attr.fillColor)) } |