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

Commit ef54a716 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Rework isAbleToDream signal" into main

parents e926bda0 d87e4882

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

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ class CommunalSceneTransitionInteractorTest : SysuiTestCase() { 
            kosmos.fakeKeyguardRepository.setKeyguardOccluded(true)

            kosmos.fakeKeyguardRepository.setDreaming(true)

            kosmos.fakeKeyguardRepository.setDreamingWithOverlay(true)

            advanceTimeBy(100L)

            advanceTimeBy(600L)



            sceneTransitions.value = hubToBlank

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -533,6 +533,8 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 
            keyguardRepository.setDozeTransitionModel(

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

            )

            advanceTimeBy(600L)



            keyguardRepository.setDreaming(true)

            keyguardRepository.setDreamingWithOverlay(true)

            advanceTimeBy(60L)
@@ -641,6 +643,7 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 
            keyguardRepository.setDozeTransitionModel(

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

            )

            advanceTimeBy(600L)

            keyguardRepository.setDreaming(true)

            keyguardRepository.setDreamingWithOverlay(true)

            advanceTimeBy(60L)
@@ -699,6 +702,7 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 
            keyguardRepository.setDozeTransitionModel(

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

            )

            advanceTimeBy(600L)

            keyguardRepository.setDreaming(true)

            keyguardRepository.setDreamingWithOverlay(true)

            advanceTimeBy(60L)

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

+25 −36
Original line number Diff line number Diff line
@@ -14,24 +14,10 @@ 
 * limitations under the License.

 */



/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



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

import com.android.systemui.coroutines.collectLastValue

import android.platform.test.annotations.EnableFlags

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

import androidx.test.filters.SmallTest
@@ -42,24 +28,28 @@ import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepos 
import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

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

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

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

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

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

import com.android.systemui.keyguard.util.KeyguardTransitionRepositorySpySubject.Companion.assertThat

import com.android.systemui.kosmos.testScope

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

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

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

import com.android.systemui.statusbar.domain.interactor.keyguardOcclusionInteractor

import com.android.systemui.testKosmos

import kotlin.test.Test

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.test.advanceTimeBy

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.reset

import org.mockito.Mockito.spy

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



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest
@@ -79,21 +69,6 @@ class FromDreamingTransitionInteractorTest : SysuiTestCase() { 
    @Before

    fun setup() {

        underTest.start()



        kosmos.fakeKeyguardRepository.setDreaming(true)

        kosmos.keyguardOcclusionInteractor.setWmNotifiedShowWhenLockedActivityOnTop(true)



        // Transition to DOZING and set the power interactor asleep.

        powerInteractor.setAsleepForTest()

        runBlocking {

            transitionRepository.sendTransitionSteps(

                from = KeyguardState.LOCKSCREEN,

                to = KeyguardState.DREAMING,

                testScope

            )

            kosmos.fakeKeyguardRepository.setBiometricUnlockState(BiometricUnlockMode.NONE)

            reset(transitionRepository)

        }

    }



    @Test
@@ -146,20 +121,27 @@ class FromDreamingTransitionInteractorTest : SysuiTestCase() { 
    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    fun testTransitionsToLockscreen_whenOccludingActivityEnds() =

        testScope.runTest {

            runCurrent()



            kosmos.fakeKeyguardRepository.setDreaming(true)

            kosmos.keyguardOcclusionRepository.setShowWhenLockedActivityInfo(onTop = true)

            kosmos.keyguardOcclusionInteractor.setWmNotifiedShowWhenLockedActivityOnTop(true)

            // Transition to DREAMING and set the power interactor awake

            powerInteractor.setAwakeForTest()



            transitionRepository.sendTransitionSteps(

                from = KeyguardState.LOCKSCREEN,

                to = KeyguardState.DREAMING,

                testScope,

                testScope

            )

            runCurrent()

            kosmos.fakeKeyguardRepository.setBiometricUnlockState(BiometricUnlockMode.NONE)



            // Get past initial setup

            advanceTimeBy(600L)

            reset(transitionRepository)



            kosmos.keyguardOcclusionRepository.setShowWhenLockedActivityInfo(onTop = false)

            kosmos.fakeKeyguardRepository.setDreaming(false)

            runCurrent()

            advanceTimeBy(60L)



            assertThat(transitionRepository)

                .startedTransition(
@@ -171,6 +153,13 @@ class FromDreamingTransitionInteractorTest : SysuiTestCase() { 
    @Test

    fun testTransitionToAlternateBouncer() =

        testScope.runTest {

            transitionRepository.sendTransitionSteps(

                from = KeyguardState.LOCKSCREEN,

                to = KeyguardState.DREAMING,

                testScope,

            )

            reset(transitionRepository)



            kosmos.fakeKeyguardBouncerRepository.setAlternateVisible(true)

            runCurrent()

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

+59 −0
Original line number Diff line number Diff line
@@ -33,11 +33,15 @@ import com.android.systemui.keyguard.data.repository.fakeCommandQueue 
import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

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

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

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

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

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

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

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

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.res.R

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

import com.android.systemui.scene.shared.model.Scenes
@@ -47,6 +51,7 @@ import com.google.common.truth.Truth.assertThat 
import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.test.advanceTimeBy

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before
@@ -67,6 +72,7 @@ class KeyguardInteractorTest : SysuiTestCase() { 
    private val configRepository by lazy { kosmos.fakeConfigurationRepository }

    private val bouncerRepository by lazy { kosmos.keyguardBouncerRepository }

    private val shadeRepository by lazy { kosmos.shadeRepository }

    private val powerInteractor by lazy { kosmos.powerInteractor }

    private val keyguardTransitionRepository by lazy { kosmos.fakeKeyguardTransitionRepository }



    private val transitionState: MutableStateFlow<ObservableTransitionState> =
@@ -349,6 +355,59 @@ class KeyguardInteractorTest : SysuiTestCase() { 
            assertThat(keyguardTranslationY).isGreaterThan(0f)

        }



    @Test

    fun isAbleToDream_falseWhenDozing() =

        testScope.runTest {

            val isAbleToDream by collectLastValue(underTest.isAbleToDream)



            repository.setDozeTransitionModel(

                DozeTransitionModel(from = DozeStateModel.INITIALIZED, to = DozeStateModel.DOZE_AOD)

            )



            assertThat(isAbleToDream).isEqualTo(false)

        }



    @Test

    fun isAbleToDream_falseWhenNotDozingAndNotDreaming() =

        testScope.runTest {

            val isAbleToDream by collectLastValue(underTest.isAbleToDream)



            repository.setDozeTransitionModel(

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

            )

            powerInteractor.setAwakeForTest()

            advanceTimeBy(1000L)



            assertThat(isAbleToDream).isEqualTo(false)

        }



    @Test

    fun isAbleToDream_trueWhenNotDozingAndIsDreaming_afterDelay() =

        testScope.runTest {

            val isAbleToDream by collectLastValue(underTest.isAbleToDream)

            runCurrent()



            repository.setDreaming(true)

            repository.setDozeTransitionModel(

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

            )

            powerInteractor.setAwakeForTest()

            runCurrent()



            // After some delay, still false

            advanceTimeBy(300L)

            assertThat(isAbleToDream).isEqualTo(false)



            // After more delay, is true

            advanceTimeBy(300L)

            assertThat(isAbleToDream).isEqualTo(true)



            // Also changes back after the minimal debounce

            repository.setDreaming(false)

            advanceTimeBy(55L)

            assertThat(isAbleToDream).isEqualTo(false)

        }



    @Test

    @EnableSceneContainer

    fun animationDozingTransitions() =

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

+15 −10
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
            keyguardRepository.setDozeTransitionModel(

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

            )

            runCurrent()

            advanceTimeBy(600L)



            // GIVEN a prior transition has run to LOCKSCREEN

            runTransitionAndSetWakefulness(KeyguardState.GONE, KeyguardState.LOCKSCREEN)
@@ -287,7 +287,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
            keyguardRepository.setDozeTransitionModel(

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

            )

            runCurrent()

            advanceTimeBy(600L)



            // GIVEN a prior transition has run to LOCKSCREEN

            runTransitionAndSetWakefulness(KeyguardState.GONE, KeyguardState.LOCKSCREEN)
@@ -625,6 +625,9 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
    @DisableSceneContainer

    fun dreamingToGoneWithKeyguardNotShowing() =

        testScope.runTest {

            // Setup - Move past initial delay with [KeyguardInteractor#isAbleToDream]

            advanceTimeBy(600L)



            // GIVEN a prior transition has run to DREAMING

            keyguardRepository.setDreamingWithOverlay(true)

            runTransitionAndSetWakefulness(KeyguardState.LOCKSCREEN, KeyguardState.DREAMING)
@@ -757,12 +760,8 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
    @DisableSceneContainer

    fun goneToDreaming() =

        testScope.runTest {

            // GIVEN a device that is not dreaming or dozing

            keyguardRepository.setDreamingWithOverlay(false)

            keyguardRepository.setDozeTransitionModel(

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

            )

            runCurrent()

            // Setup - Move past initial delay with [KeyguardInteractor#isAbleToDream]

            advanceTimeBy(600L)



            // GIVEN a prior transition has run to GONE

            runTransitionAndSetWakefulness(KeyguardState.LOCKSCREEN, KeyguardState.GONE)
@@ -1130,6 +1129,9 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
    @DisableSceneContainer

    fun primaryBouncerToGlanceableHubWhileDreaming() =

        testScope.runTest {

            // Setup - Move past initial delay with [KeyguardInteractor#isAbleToDream]

            advanceTimeBy(600L)



            // GIVEN the device is idle on the glanceable hub

            communalSceneInteractor.changeScene(CommunalScenes.Communal)

            runCurrent()
@@ -1144,6 +1146,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
            // GIVEN that we are dreaming and occluded

            keyguardRepository.setDreaming(true)

            keyguardRepository.setKeyguardOccluded(true)

            advanceTimeBy(60L)



            // WHEN the primaryBouncer stops showing

            bouncerRepository.setPrimaryShow(false)
@@ -2181,12 +2184,14 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
    @DisableFlags(FLAG_COMMUNAL_SCENE_KTF_REFACTOR)

    fun glanceableHubToDreaming() =

        testScope.runTest {

            runCurrent()



            // GIVEN that we are dreaming and not dozing

            keyguardRepository.setDreaming(true)

            keyguardRepository.setDozeTransitionModel(

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

            )

            runCurrent()

            advanceTimeBy(600L)



            // GIVEN a prior transition has run to GLANCEABLE_HUB

            runTransitionAndSetWakefulness(KeyguardState.DREAMING, KeyguardState.GLANCEABLE_HUB)
@@ -2233,7 +2238,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
            keyguardRepository.setDozeTransitionModel(

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

            )

            advanceTimeBy(100L)

            advanceTimeBy(600L)



            // GIVEN a prior transition has run to GLANCEABLE_HUB

            communalSceneInteractor.changeScene(CommunalScenes.Communal)