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

Commit f60dbb94 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix || for != in QSTileViewImpl" into udc-dev am: 952b8f15 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22162859



Change-Id: I99d73e5374567d02c5a56752653c1091d09d306d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 433e9d9f 952b8f15

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ open class QSTileViewImpl @JvmOverloads constructor( 
        }



        // Colors

        if (state.state != lastState || state.disabledByPolicy || lastDisabledByPolicy) {

        if (state.state != lastState || state.disabledByPolicy != lastDisabledByPolicy) {

            singleAnimator.cancel()

            mQsLogger?.logTileBackgroundColorUpdateIfInternetTile(

                    state.spec,

packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileViewImplTest.kt

+20 −0
Original line number Diff line number Diff line
@@ -316,6 +316,26 @@ class QSTileViewImplTest : SysuiTestCase() { 
        assertThat(colorsDisabledByPolicy).containsExactlyElementsIn(colorsUnavailable)

    }



    @Test

    fun testDisableByPolicyThenRemoved_changesColor() {

        val stateActive = QSTile.State()

        stateActive.state = Tile.STATE_ACTIVE



        val stateDisabledByPolicy = stateActive.copy()

        stateDisabledByPolicy.disabledByPolicy = true



        tileView.changeState(stateActive)

        val activeColors = tileView.getCurrentColors()



        tileView.changeState(stateDisabledByPolicy)

        // It has unavailable colors

        assertThat(tileView.getCurrentColors()).isNotEqualTo(activeColors)



        // When we get back to not disabled by policy tile, it should go back to active colors

        tileView.changeState(stateActive)

        assertThat(tileView.getCurrentColors()).containsExactlyElementsIn(activeColors)

    }



    @Test

    fun testDisabledByPolicy_secondaryLabelText() {

        val testA11yLabel = "TEST_LABEL"