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

Commit 63108dfb authored by William Xiao's avatar William Xiao Committed by Android (Google) Code Review
Browse files

Merge changes Ida1ee588,Ib5a356ad into main 

* changes:
  Fix misc issues for transition to hub when turning screen on
  Fix glanceable hub not showing when waking from doze
parents 7e0204e0 b0accc8e

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalSceneTransitionInteractorTest.kt

+6 −14
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import com.android.systemui.flags.fakeFeatureFlagsClassic 
import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

import com.android.systemui.keyguard.data.repository.keyguardTransitionRepository

import com.android.systemui.keyguard.data.repository.realKeyguardTransitionRepository

import com.android.systemui.keyguard.shared.model.DozeStateModel

import com.android.systemui.keyguard.shared.model.DozeTransitionModel

import com.android.systemui.keyguard.shared.model.KeyguardState.ALTERNATE_BOUNCER

import com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING

import com.android.systemui.keyguard.shared.model.KeyguardState.GLANCEABLE_HUB
@@ -50,8 +48,6 @@ import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING 
import com.android.systemui.keyguard.shared.model.TransitionState.STARTED

import com.android.systemui.keyguard.shared.model.TransitionStep

import com.android.systemui.kosmos.testScope

import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAwakeForTest

import com.android.systemui.power.domain.interactor.powerInteractor

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlin.time.Duration.Companion.seconds
@@ -220,15 +216,11 @@ class CommunalSceneTransitionInteractorTest : SysuiTestCase() { 
    @Test

    fun transition_from_hub_end_in_dream() =

        testScope.runTest {

            // Device is dreaming and not dozing.

            kosmos.powerInteractor.setAwakeForTest()

            kosmos.fakeKeyguardRepository.setDozeTransitionModel(

                DozeTransitionModel(from = DozeStateModel.DOZE, to = DozeStateModel.FINISH)

            )

            // Device is dreaming and occluded.

            kosmos.fakeKeyguardRepository.setKeyguardOccluded(true)

            kosmos.fakeKeyguardRepository.setDreaming(true)

            kosmos.fakeKeyguardRepository.setDreamingWithOverlay(true)

            advanceTimeBy(600L)

            runCurrent()



            sceneTransitions.value = hubToBlank
@@ -663,7 +655,7 @@ class CommunalSceneTransitionInteractorTest : SysuiTestCase() { 
                    from = LOCKSCREEN,

                    to = OCCLUDED,

                    animator = null,

                    modeOnCanceled = TransitionModeOnCanceled.RESET

                    modeOnCanceled = TransitionModeOnCanceled.RESET,

                )

            )
@@ -750,7 +742,7 @@ class CommunalSceneTransitionInteractorTest : SysuiTestCase() { 
                    from = LOCKSCREEN,

                    to = OCCLUDED,

                    animator = null,

                    modeOnCanceled = TransitionModeOnCanceled.RESET

                    modeOnCanceled = TransitionModeOnCanceled.RESET,

                )

            )
@@ -852,8 +844,8 @@ class CommunalSceneTransitionInteractorTest : SysuiTestCase() { 
                    to = ALTERNATE_BOUNCER,

                    animator = null,

                    ownerName = "external",

                    modeOnCanceled = TransitionModeOnCanceled.RESET

                ),

                    modeOnCanceled = TransitionModeOnCanceled.RESET,

                )

            )



            val allSteps by collectValues(keyguardTransitionRepository.transitions)

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt

+26 −0
Original line number Diff line number Diff line
@@ -26,8 +26,10 @@ import com.android.compose.animation.scene.ObservableTransitionState 
import com.android.systemui.Flags.FLAG_COMMUNAL_HUB

import com.android.systemui.Flags.FLAG_COMMUNAL_SCENE_KTF_REFACTOR

import com.android.systemui.Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR

import com.android.systemui.Flags.FLAG_SCENE_CONTAINER

import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.data.repository.FakeCommunalSceneRepository

import com.android.systemui.communal.data.repository.communalSceneRepository

import com.android.systemui.communal.data.repository.fakeCommunalSceneRepository

import com.android.systemui.communal.domain.interactor.setCommunalAvailable

import com.android.systemui.communal.shared.model.CommunalScenes
@@ -50,10 +52,12 @@ import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.se 
import com.android.systemui.power.domain.interactor.powerInteractor

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.testKosmos

import com.google.common.truth.Truth

import junit.framework.Assert.assertEquals

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.test.advanceTimeBy

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before
@@ -218,6 +222,28 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT 
                .startedTransition(from = KeyguardState.DOZING, to = KeyguardState.GLANCEABLE_HUB)

        }



    @Test

    @DisableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR, FLAG_SCENE_CONTAINER)

    @EnableFlags(FLAG_COMMUNAL_SCENE_KTF_REFACTOR)

    fun testTransitionToGlanceableHub_onWakeup_ifAvailable() =

        testScope.runTest {

            // Hub is available.

            whenever(kosmos.dreamManager.canStartDreaming(anyBoolean())).thenReturn(true)

            kosmos.setCommunalAvailable(true)

            runCurrent()



            // Device turns on.

            powerInteractor.setAwakeForTest()

            advanceTimeBy(50L)

            runCurrent()



            // We transition to the hub when waking up.

            Truth.assertThat(kosmos.communalSceneRepository.currentScene.value)

                .isEqualTo(CommunalScenes.Communal)

            // No transitions are directly started by this interactor.

            assertThat(transitionRepository).noTransitionsStarted()

        }



    @Test

    @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    fun testTransitionToOccluded_onWakeup_whenOccludingActivityOnTop() =

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractorTest.kt

+62 −13
Original line number Diff line number Diff line
@@ -16,12 +16,19 @@ 


package com.android.systemui.keyguard.domain.interactor



import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import androidx.test.ext.junit.runners.AndroidJUnit4

import android.platform.test.flag.junit.FlagsParameterization

import android.service.dream.dreamManager

import androidx.test.filters.SmallTest

import com.android.systemui.Flags

import com.android.systemui.Flags.FLAG_COMMUNAL_SCENE_KTF_REFACTOR

import com.android.systemui.SysuiTestCase

import com.android.systemui.bouncer.data.repository.fakeKeyguardBouncerRepository

import com.android.systemui.communal.data.repository.communalSceneRepository

import com.android.systemui.communal.domain.interactor.setCommunalAvailable

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.flags.andSceneContainer

import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
@@ -36,6 +43,7 @@ import com.android.systemui.statusbar.domain.interactor.keyguardOcclusionInterac 
import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.test.advanceTimeBy

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest
@@ -43,26 +51,52 @@ import org.junit.Before 
import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.anyBoolean

import org.mockito.Mockito.reset

import org.mockito.Mockito.spy

import org.mockito.kotlin.whenever

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RunWith(AndroidJUnit4::class)

class FromDreamingTransitionInteractorTest : SysuiTestCase() {

@RunWith(ParameterizedAndroidJunit4::class)

class FromDreamingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiTestCase() {

    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf(FLAG_COMMUNAL_SCENE_KTF_REFACTOR)

                .andSceneContainer()

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

    }



    private val kosmos =

        testKosmos().apply {

            this.fakeKeyguardTransitionRepository = spy(FakeKeyguardTransitionRepository())

        }



    private val testScope = kosmos.testScope

    private val underTest = kosmos.fromDreamingTransitionInteractor

    private val underTest by lazy { kosmos.fromDreamingTransitionInteractor }



    private val powerInteractor = kosmos.powerInteractor

    private val transitionRepository = kosmos.fakeKeyguardTransitionRepository



    @Before

    fun setup() {

        runBlocking {

            transitionRepository.sendTransitionSteps(

                from = KeyguardState.LOCKSCREEN,

                to = KeyguardState.DREAMING,

                testScope,

            )

            reset(transitionRepository)

            kosmos.setCommunalAvailable(true)

        }

        underTest.start()

    }
@@ -86,10 +120,7 @@ class FromDreamingTransitionInteractorTest : SysuiTestCase() { 
            runCurrent()



            assertThat(transitionRepository)

                .startedTransition(

                    from = KeyguardState.DREAMING,

                    to = KeyguardState.OCCLUDED,

                )

                .startedTransition(from = KeyguardState.DREAMING, to = KeyguardState.OCCLUDED)

        }



    @Test
@@ -126,7 +157,7 @@ class FromDreamingTransitionInteractorTest : SysuiTestCase() { 
            transitionRepository.sendTransitionSteps(

                from = KeyguardState.LOCKSCREEN,

                to = KeyguardState.DREAMING,

                testScope

                testScope,

            )

            kosmos.fakeKeyguardRepository.setBiometricUnlockState(BiometricUnlockMode.NONE)
@@ -139,10 +170,7 @@ class FromDreamingTransitionInteractorTest : SysuiTestCase() { 
            advanceTimeBy(60L)



            assertThat(transitionRepository)

                .startedTransition(

                    from = KeyguardState.DREAMING,

                    to = KeyguardState.LOCKSCREEN,

                )

                .startedTransition(from = KeyguardState.DREAMING, to = KeyguardState.LOCKSCREEN)

        }



    @Test
@@ -164,4 +192,25 @@ class FromDreamingTransitionInteractorTest : SysuiTestCase() { 
                    to = KeyguardState.ALTERNATE_BOUNCER,

                )

        }



    @Test

    @EnableFlags(FLAG_COMMUNAL_SCENE_KTF_REFACTOR)

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun testTransitionToGlanceableHubOnWake() =

        testScope.runTest {

            whenever(kosmos.dreamManager.canStartDreaming(anyBoolean())).thenReturn(true)

            kosmos.setCommunalAvailable(true)

            runCurrent()



            // Device wakes up.

            powerInteractor.setAwakeForTest()

            advanceTimeBy(150L)

            runCurrent()



            // We transition to the hub when waking up.

            assertThat(kosmos.communalSceneRepository.currentScene.value)

                .isEqualTo(CommunalScenes.Communal)

            // No transitions are directly started by this interactor.

            assertThat(transitionRepository).noTransitionsStarted()

        }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt

+3 −8
Original line number Diff line number Diff line
@@ -1465,10 +1465,8 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 


            // WHEN the keyguard is occluded and device wakes up and is no longer dreaming

            keyguardRepository.setDreaming(false)

            testScheduler.advanceTimeBy(150) // The dreaming signal is debounced.

            runCurrent()

            keyguardRepository.setKeyguardOccluded(true)

            powerInteractor.setAwakeForTest()

            testScheduler.advanceTimeBy(150) // The dreaming and occluded signals are debounced.

            runCurrent()



            // THEN a transition to OCCLUDED should occur
@@ -2059,12 +2057,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
    fun glanceableHubToOccluded_communalKtfRefactor() =

        testScope.runTest {

            // GIVEN device is not dreaming

            powerInteractor.setAwakeForTest()

            keyguardRepository.setDreaming(false)

            keyguardRepository.setDozeTransitionModel(

                DozeTransitionModel(from = DozeStateModel.DOZE, to = DozeStateModel.FINISH)

            )

            advanceTimeBy(600.milliseconds)



            // GIVEN a prior transition has run to GLANCEABLE_HUB

            communalSceneInteractor.changeScene(CommunalScenes.Communal, "test")
@@ -2073,6 +2066,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 


            // WHEN the keyguard is occluded

            keyguardRepository.setKeyguardOccluded(true)

            advanceTimeBy(200.milliseconds)

            runCurrent()



            assertThat(transitionRepository)
@@ -2218,6 +2212,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
            advanceTimeBy(10.milliseconds)

            keyguardRepository.setKeyguardOccluded(true)

            advanceTimeBy(200.milliseconds)

            runCurrent()



            assertThat(transitionRepository)

                .startedTransition(

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt

+64 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.systemui.keyguard.domain.interactor.keyguardInteractor 
import com.android.systemui.keyguard.shared.model.BurnInModel

import com.android.systemui.keyguard.shared.model.KeyguardState.ALTERNATE_BOUNCER

import com.android.systemui.keyguard.shared.model.KeyguardState.AOD

import com.android.systemui.keyguard.shared.model.KeyguardState.DOZING

import com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING

import com.android.systemui.keyguard.shared.model.KeyguardState.GLANCEABLE_HUB

import com.android.systemui.keyguard.shared.model.KeyguardState.GONE
@@ -356,6 +357,69 @@ class SharedNotificationContainerViewModelTest(flags: FlagsParameterization) : S 


    @Test

    fun glanceableHubAlpha_dreamToHub() =

        testScope.runTest {

            val alpha by collectLastValue(underTest.glanceableHubAlpha)



            // Start on lockscreen, notifications should be unhidden.

            showLockscreen()

            assertThat(alpha).isEqualTo(1f)



            // Go to dozing

            keyguardTransitionRepository.sendTransitionSteps(

                from = LOCKSCREEN,

                to = DOZING,

                testScope,

            )

            assertThat(alpha).isEqualTo(1f)



            // Start transitioning to glanceable hub

            val progress = 0.6f

            kosmos.setTransition(

                sceneTransition = Transition(from = Scenes.Lockscreen, to = Scenes.Communal),

                stateTransition =

                    TransitionStep(

                        transitionState = TransitionState.STARTED,

                        from = DOZING,

                        to = GLANCEABLE_HUB,

                        value = 0f,

                    ),

            )

            runCurrent()

            kosmos.setTransition(

                sceneTransition =

                    Transition(

                        from = Scenes.Lockscreen,

                        to = Scenes.Communal,

                        progress = flowOf(progress),

                    ),

                stateTransition =

                    TransitionStep(

                        transitionState = TransitionState.RUNNING,

                        from = DOZING,

                        to = GLANCEABLE_HUB,

                        value = progress,

                    ),

            )

            runCurrent()

            // Keep notifications hidden during the transition from dream to hub

            assertThat(alpha).isEqualTo(0)



            // Finish transition to glanceable hub

            kosmos.setTransition(

                sceneTransition = Idle(Scenes.Communal),

                stateTransition =

                    TransitionStep(

                        transitionState = TransitionState.FINISHED,

                        from = DOZING,

                        to = GLANCEABLE_HUB,

                        value = 1f,

                    ),

            )

            assertThat(alpha).isEqualTo(0f)

        }



    @Test

    fun glanceableHubAlpha_dozingToHub() =

        testScope.runTest {

            val alpha by collectLastValue(underTest.glanceableHubAlpha)