Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4251c72e authored by Bryce Lee's avatar Bryce Lee
Browse files

Remap TonedIcon backgroundColor attribute to iconBackgroundColor. 

The attribute backgroundColor can potentially conflict with resources in other libraries, leading to resource merging errors.

Bug: 216982220
Test: manual
Change-Id: I25e2aace6c87d4fa887b401bc199afe687ca464e
parent e1d6e207

packages/SystemUI/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

packages/SystemUI/res/values/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/DualToneHandler.kt

+2 −2
Original line number Diff line number Diff line
@@ -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))

    }