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

Commit 3b3ddf22 authored by Matías Hernández's avatar Matías Hernández
Browse files

Use the new Priority Modes icon in the QS tile 

Fixes: 362931039
Test: atest ModesTileDataInteractorTest
Flag: android.app.modes_ui
Change-Id: I53a51ee831c8949722ed6fcd5ad73aedefd4b81c
parent 188126dc

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesTileDataInteractorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ class ModesTileDataInteractorTest : SysuiTestCase() { 
    private companion object {

        val TEST_USER = UserHandle.of(1)!!



        val MODES_DRAWABLE_ID = com.android.systemui.res.R.drawable.qs_dnd_icon_off

        val MODES_DRAWABLE_ID = R.drawable.ic_zen_priority_modes



        val MODES_DRAWABLE = TestStubDrawable("modes_icon")

        val BEDTIME_DRAWABLE = TestStubDrawable("bedtime")

packages/SystemUI/src/com/android/systemui/qs/tiles/ModesTile.kt

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Intent 
import android.os.Handler

import android.os.Looper

import android.service.quicksettings.Tile

import androidx.annotation.DrawableRes

import androidx.lifecycle.Lifecycle

import androidx.lifecycle.coroutineScope

import androidx.lifecycle.repeatOnLifecycle
@@ -98,7 +99,7 @@ constructor( 
    override fun newTileState(): QSTile.State {

        return QSTile.State().apply {

            label = mContext.getString(R.string.quick_settings_modes_label)

            icon = ResourceIcon.get(R.drawable.qs_dnd_icon_off)

            icon = ResourceIcon.get(ICON_RES_ID)

            state = Tile.STATE_INACTIVE

        }

    }
@@ -116,7 +117,7 @@ constructor( 
            state?.apply {

                this.state = tileState.activationState.legacyState

                val tileStateIcon = tileState.icon()

                icon = tileStateIcon?.asQSTileIcon() ?: ResourceIcon.get(R.drawable.qs_dnd_icon_off)

                icon = tileStateIcon?.asQSTileIcon() ?: ResourceIcon.get(ICON_RES_ID)

                label = tileLabel

                secondaryLabel = tileState.secondaryLabel

                contentDescription = tileState.contentDescription
@@ -127,5 +128,6 @@ constructor( 


    companion object {

        const val TILE_SPEC = "dnd"

        @DrawableRes val ICON_RES_ID = com.android.internal.R.drawable.ic_zen_priority_modes

    }

}

packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/domain/interactor/ModesTileDataInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ constructor( 
    fun tileData() =

        zenModeInteractor.activeModes

            .map { activeModes ->

                val modesIconResId = R.drawable.qs_dnd_icon_off

                val modesIconResId = com.android.internal.R.drawable.ic_zen_priority_modes



                if (usesModeIcons()) {

                    val mainModeDrawable = activeModes.mainMode?.icon?.drawable

packages/SystemUI/src/com/android/systemui/statusbar/policy/PolicyModule.kt

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ interface PolicyModule { 
                    tileSpec = TileSpec.create(DND_TILE_SPEC),

                    uiConfig =

                        QSTileUIConfig.Resource(

                            iconRes = R.drawable.qs_dnd_icon_off,

                            iconRes = com.android.internal.R.drawable.ic_zen_priority_modes,

                            labelRes = R.string.quick_settings_modes_label,

                        ),

                    instanceId = uiEventLogger.getNewInstanceId(),

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ModesTileTest.kt

+2 −8
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.qs.tiles



import android.graphics.drawable.TestStubDrawable

import android.os.Handler

import android.platform.test.annotations.EnableFlags

import android.service.quicksettings.Tile
@@ -93,12 +92,7 @@ class ModesTileTest : SysuiTestCase() { 
        ModesTileDataInteractor(context, kosmos.zenModeInteractor, testDispatcher)

    private val mapper =

        ModesTileMapper(

            context.orCreateTestableResources

                .apply {

                    addOverride(R.drawable.qs_dnd_icon_on, TestStubDrawable())

                    addOverride(R.drawable.qs_dnd_icon_off, TestStubDrawable())

                }

                .resources,

            context.resources,

            context.theme,

        )
@@ -122,7 +116,7 @@ class ModesTileTest : SysuiTestCase() { 
                QSTileConfigTestBuilder.build {

                    uiConfig =

                        QSTileUIConfig.Resource(

                            iconRes = R.drawable.qs_dnd_icon_off,

                            iconRes = ModesTile.ICON_RES_ID,

                            labelRes = R.string.quick_settings_modes_label,

                        )

                }