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

Commit 5812079c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Specify AOD when changing to lockscreen for sleep" into main

parents 37a2093a 3dd090ff

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt

+65 −9
Original line number Diff line number Diff line
@@ -48,8 +48,13 @@ import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFaceAuthRepo 
import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository

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

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

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

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

import com.android.systemui.keyguard.dismissCallbackRegistry

import com.android.systemui.keyguard.domain.interactor.keyguardEnabledInteractor

import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor

import com.android.systemui.keyguard.domain.interactor.scenetransition.lockscreenSceneTransitionInteractor

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.model.sysUiState
@@ -59,6 +64,7 @@ import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.se 
import com.android.systemui.power.domain.interactor.powerInteractor

import com.android.systemui.power.shared.model.WakeSleepReason

import com.android.systemui.power.shared.model.WakefulnessState

import com.android.systemui.scene.data.repository.Transition

import com.android.systemui.scene.domain.interactor.sceneInteractor

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

import com.android.systemui.scene.shared.model.fakeSceneDataSource
@@ -390,6 +396,64 @@ class SceneContainerStartableTest : SysuiTestCase() { 
            assertThat(currentSceneKey).isEqualTo(Scenes.Lockscreen)

        }



    @Test

    fun switchToAOD_whenAvailable_whenDeviceSleepsLocked() =

        testScope.runTest {

            kosmos.lockscreenSceneTransitionInteractor.start()

            val asleepState by

                collectLastValue(kosmos.keyguardTransitionInteractor.asleepKeyguardState)

            val currentTransitionInfo by

                collectLastValue(kosmos.keyguardTransitionRepository.currentTransitionInfoInternal)

            val transitionState =

                prepareState(

                    isDeviceUnlocked = false,

                    initialSceneKey = Scenes.Shade,

                )

            kosmos.keyguardRepository.setAodAvailable(true)

            runCurrent()

            assertThat(asleepState).isEqualTo(KeyguardState.AOD)

            underTest.start()

            powerInteractor.setAsleepForTest()

            runCurrent()

            transitionState.value =

                ObservableTransitionState.Transition(

                    fromScene = Scenes.Shade,

                    toScene = Scenes.Lockscreen,

                    currentScene = flowOf(Scenes.Lockscreen),

                    progress = flowOf(0.5f),

                    isInitiatedByUserInput = true,

                    isUserInputOngoing = flowOf(false),

                )

            runCurrent()



            assertThat(currentTransitionInfo?.to).isEqualTo(KeyguardState.AOD)

        }



    @Test

    fun switchToDozing_whenAodUnavailable_whenDeviceSleepsLocked() =

        testScope.runTest {

            kosmos.lockscreenSceneTransitionInteractor.start()

            val asleepState by

                collectLastValue(kosmos.keyguardTransitionInteractor.asleepKeyguardState)

            val currentTransitionInfo by

                collectLastValue(kosmos.keyguardTransitionRepository.currentTransitionInfoInternal)

            val transitionState =

                prepareState(

                    isDeviceUnlocked = false,

                    initialSceneKey = Scenes.Shade,

                )

            kosmos.keyguardRepository.setAodAvailable(false)

            runCurrent()

            assertThat(asleepState).isEqualTo(KeyguardState.DOZING)

            underTest.start()

            powerInteractor.setAsleepForTest()

            runCurrent()

            transitionState.value = Transition(from = Scenes.Shade, to = Scenes.Lockscreen)

            runCurrent()



            assertThat(currentTransitionInfo?.to).isEqualTo(KeyguardState.DOZING)

        }



    @Test

    fun switchToGoneWhenDoubleTapPowerGestureIsTriggeredFromGone() =

        testScope.runTest {
@@ -409,15 +473,7 @@ class SceneContainerStartableTest : SysuiTestCase() { 
                lastSleepReason = WakeSleepReason.POWER_BUTTON,

                powerButtonLaunchGestureTriggered = false,

            )

            transitionStateFlow.value =

                ObservableTransitionState.Transition(

                    fromScene = Scenes.Gone,

                    toScene = Scenes.Lockscreen,

                    currentScene = flowOf(Scenes.Lockscreen),

                    progress = flowOf(0.5f),

                    isInitiatedByUserInput = true,

                    isUserInputOngoing = flowOf(false),

                )

            transitionStateFlow.value = Transition(from = Scenes.Shade, to = Scenes.Lockscreen)

            assertThat(currentSceneKey).isEqualTo(Scenes.Lockscreen)



            kosmos.fakePowerRepository.updateWakefulness(

packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt

+9 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.deviceentry.shared.model.DeviceUnlockSource 
import com.android.systemui.keyguard.DismissCallbackRegistry

import com.android.systemui.keyguard.domain.interactor.KeyguardEnabledInteractor

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor

import com.android.systemui.keyguard.domain.interactor.WindowManagerLockscreenVisibilityInteractor

import com.android.systemui.model.SceneContainerPlugin

import com.android.systemui.model.SysUiState
@@ -107,6 +108,7 @@ constructor( 
    private val deviceUnlockedInteractor: DeviceUnlockedInteractor,

    private val bouncerInteractor: BouncerInteractor,

    private val keyguardInteractor: KeyguardInteractor,

    private val keyguardTransitionInteractor: KeyguardTransitionInteractor,

    private val sysUiState: SysUiState,

    @DisplayId private val displayId: Int,

    private val sceneLogger: SceneLogger,
@@ -420,9 +422,9 @@ constructor( 
            powerInteractor.isAsleep.collect { isAsleep ->

                if (isAsleep) {

                    switchToScene(

                        // TODO(b/336581871): add sceneState?

                        targetSceneKey = Scenes.Lockscreen,

                        loggingReason = "device is starting to sleep",

                        sceneState = keyguardTransitionInteractor.asleepKeyguardState.value,

                    )

                } else {

                    val canSwipeToEnter = deviceEntryInteractor.canSwipeToEnter.value
@@ -702,10 +704,15 @@ constructor( 
        }

    }



    private fun switchToScene(targetSceneKey: SceneKey, loggingReason: String) {

    private fun switchToScene(

        targetSceneKey: SceneKey,

        loggingReason: String,

        sceneState: Any? = null

    ) {

        sceneInteractor.changeScene(

            toScene = targetSceneKey,

            loggingReason = loggingReason,

            sceneState = sceneState,

        )

    }

packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeLockscreenInteractorImpl.kt

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.shade.domain.interactor 
import com.android.keyguard.LockIconViewController

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

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

import com.android.systemui.scene.domain.interactor.SceneInteractor

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

import com.android.systemui.scene.shared.model.Scenes
@@ -96,7 +97,7 @@ constructor( 
    }



    override fun showAodUi() {

        sceneInteractor.changeScene(Scenes.Lockscreen, "showAodUi")

        sceneInteractor.changeScene(Scenes.Lockscreen, "showAodUi", sceneState = KeyguardState.AOD)

        // TODO(b/330311871) implement transition to AOD

    }

packages/SystemUI/tests/utils/src/com/android/systemui/scene/domain/startable/SceneContainerStartableKosmos.kt

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteract 
import com.android.systemui.keyguard.dismissCallbackRegistry

import com.android.systemui.keyguard.domain.interactor.keyguardEnabledInteractor

import com.android.systemui.keyguard.domain.interactor.keyguardInteractor

import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor

import com.android.systemui.keyguard.domain.interactor.windowManagerLockscreenVisibilityInteractor

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture
@@ -54,6 +55,7 @@ val Kosmos.sceneContainerStartable by Fixture { 
        deviceUnlockedInteractor = deviceUnlockedInteractor,

        bouncerInteractor = bouncerInteractor,

        keyguardInteractor = keyguardInteractor,

        keyguardTransitionInteractor = keyguardTransitionInteractor,

        sysUiState = sysUiState,

        displayId = displayTracker.defaultDisplayId,

        sceneLogger = sceneLogger,