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

Commit bc80bc50 authored by Behnam Heydarshahi's avatar Behnam Heydarshahi Committed by Android (Google) Code Review
Browse files

Merge "QS Tile Icons: use Icon.res, ditch state.iconResId" into main

parents 4fa18de5 d0628f50

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImplTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ class QSTileViewModelImplTest : SysuiTestCase() { 
                    "test_spec:\n" +

                        "    QSTileState(" +

                        "icon=Resource(res=0, contentDescription=Resource(res=0)), " +

                        "iconRes=null, " +

                        "label=test_data, " +

                        "activationState=INACTIVE, " +

                        "secondaryLabel=null, " +

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/AirplaneModeMapperTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ class AirplaneModeMapperTest : SysuiTestCase() { 
    ): QSTileState {

        val label = context.getString(R.string.airplane_mode)

        return QSTileState(

            Icon.Loaded(context.getDrawable(iconRes)!!, null),

            iconRes,

            Icon.Loaded(context.getDrawable(iconRes)!!, null, iconRes),

            label,

            activationState,

            secondaryLabel,

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapperTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -178,8 +178,7 @@ class AlarmTileMapperTest : SysuiTestCase() { 
    ): QSTileState {

        val label = context.getString(R.string.status_bar_alarm)

        return QSTileState(

            Icon.Loaded(context.getDrawable(R.drawable.ic_alarm)!!, null),

            R.drawable.ic_alarm,

            Icon.Loaded(context.getDrawable(R.drawable.ic_alarm)!!, null, R.drawable.ic_alarm),

            label,

            activationState,

            secondaryLabel,

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/battery/ui/BatterySaverTileMapperTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -253,8 +253,7 @@ class BatterySaverTileMapperTest : SysuiTestCase() { 
    ): QSTileState {

        val label = context.getString(R.string.battery_detail_switch_title)

        return QSTileState(

            Icon.Loaded(context.getDrawable(iconRes)!!, null),

            iconRes,

            Icon.Loaded(context.getDrawable(iconRes)!!, null, iconRes),

            label,

            activationState,

            secondaryLabel,

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/colorcorrection/domain/ColorCorrectionTileMapperTest.kt

+5 −2
Original line number Diff line number Diff line
@@ -77,8 +77,11 @@ class ColorCorrectionTileMapperTest : SysuiTestCase() { 
    ): QSTileState {

        val label = context.getString(R.string.quick_settings_color_correction_label)

        return QSTileState(

            Icon.Loaded(context.getDrawable(R.drawable.ic_qs_color_correction)!!, null),

            Icon.Loaded(

                context.getDrawable(R.drawable.ic_qs_color_correction)!!,

                null,

                R.drawable.ic_qs_color_correction,

            ),

            label,

            activationState,

            secondaryLabel,