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

Commit 1605e9e6 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "flexi" into main 

* changes:
  [flexiglass] Switch scenes when keyguard enabledness changes
  [flexiglass] Home family resolver considers keyguard enabledness
parents 3a17e267 3d6fe892

packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeSceneViewModelTest.kt

+12 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepositor 
import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteractor

import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteractor

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

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

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

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

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.testScope

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

import com.android.systemui.scene.domain.interactor.sceneInteractor
@@ -71,6 +72,17 @@ class NotificationsShadeSceneViewModelTest : SysuiTestCase() { 
                .isEqualTo(Scenes.Lockscreen)

                .isEqualTo(Scenes.Lockscreen)

        }

        }





    @Test

    fun upTransitionSceneKey_deviceLocked_keyguardDisabled_gone() =

        testScope.runTest {

            val destinationScenes by collectLastValue(underTest.destinationScenes)

            lockDevice()

            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)



            assertThat(destinationScenes?.get(Swipe.Up)?.toScene).isEqualTo(SceneFamilies.Home)

            assertThat(kosmos.homeSceneFamilyResolver.resolvedScene.value).isEqualTo(Scenes.Gone)

        }



    @Test

    @Test

    fun upTransitionSceneKey_deviceUnlocked_gone() =

    fun upTransitionSceneKey_deviceUnlocked_gone() =

        testScope.runTest {

        testScope.runTest {

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt

+32 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.systemui.flags.EnableSceneContainer 
import com.android.systemui.flags.Flags

import com.android.systemui.flags.Flags

import com.android.systemui.flags.fakeFeatureFlagsClassic

import com.android.systemui.flags.fakeFeatureFlagsClassic

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

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

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

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.testScope

import com.android.systemui.media.controls.data.repository.mediaFilterRepository

import com.android.systemui.media.controls.data.repository.mediaFilterRepository
@@ -159,6 +160,37 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { 
            assertThat(homeScene).isEqualTo(Scenes.Lockscreen)

            assertThat(homeScene).isEqualTo(Scenes.Lockscreen)

        }

        }





    @Test

    fun destinations_whenNotCustomizing_withPreviousSceneLockscreen_butLockscreenDisabled() =

        testScope.runTest {

            overrideResource(R.bool.config_use_split_notification_shade, false)

            qsFlexiglassAdapter.setCustomizing(false)

            val destinations by collectLastValue(underTest.destinationScenes)



            val currentScene by collectLastValue(sceneInteractor.currentScene)

            val backScene by collectLastValue(sceneBackInteractor.backScene)

            val homeScene by collectLastValue(kosmos.homeSceneFamilyResolver.resolvedScene)

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

            sceneInteractor.changeScene(Scenes.QuickSettings, "reason")



            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)



            assertThat(currentScene).isEqualTo(Scenes.Gone)

            assertThat(backScene).isNull()

            assertThat(destinations)

                .isEqualTo(

                    mapOf(

                        Back to UserActionResult(Scenes.Shade),

                        Swipe(SwipeDirection.Up) to UserActionResult(Scenes.Shade),

                        Swipe(

                            fromSource = Edge.Bottom,

                            direction = SwipeDirection.Up,

                        ) to UserActionResult(SceneFamilies.Home)

                    )

                )

            assertThat(homeScene).isEqualTo(Scenes.Gone)

        }



    @Test

    @Test

    fun destinations_whenNotCustomizing_authMethodSwipe_lockscreenNotDismissed() =

    fun destinations_whenNotCustomizing_authMethodSwipe_lockscreenNotDismissed() =

        testScope.runTest {

        testScope.runTest {

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeSceneViewModelTest.kt

+13 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepositor 
import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteractor

import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteractor

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

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

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

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

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.testScope

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

import com.android.systemui.scene.domain.interactor.sceneInteractor
@@ -71,6 +72,18 @@ class QuickSettingsShadeSceneViewModelTest : SysuiTestCase() { 
            assertThat(homeScene).isEqualTo(Scenes.Lockscreen)

            assertThat(homeScene).isEqualTo(Scenes.Lockscreen)

        }

        }





    @Test

    fun upTransitionSceneKey_deviceLocked_keyguardDisabled_gone() =

        testScope.runTest {

            val destinationScenes by collectLastValue(underTest.destinationScenes)

            val homeScene by collectLastValue(kosmos.homeSceneFamilyResolver.resolvedScene)

            lockDevice()

            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)



            assertThat(destinationScenes?.get(Swipe.Up)?.toScene).isEqualTo(SceneFamilies.Home)

            assertThat(homeScene).isEqualTo(Scenes.Gone)

        }



    @Test

    @Test

    fun upTransitionSceneKey_deviceUnlocked_gone() =

    fun upTransitionSceneKey_deviceUnlocked_gone() =

        testScope.runTest {

        testScope.runTest {

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

+112 −9
Original line number Original line Diff line number Diff line
@@ -36,12 +36,15 @@ import com.android.systemui.classifier.falsingCollector 
import com.android.systemui.classifier.falsingManager

import com.android.systemui.classifier.falsingManager

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository

import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository

import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

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

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

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

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

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

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

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

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

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

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

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

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

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.testScope

import com.android.systemui.model.sysUiState

import com.android.systemui.model.sysUiState
@@ -1339,6 +1342,111 @@ class SceneContainerStartableTest : SysuiTestCase() { 
            assertThat(uiEventLoggerFake.numLogs()).isEqualTo(1)

            assertThat(uiEventLoggerFake.numLogs()).isEqualTo(1)

        }

        }





    @Test

    fun switchToGone_whenKeyguardBecomesDisabled() =

        testScope.runTest {

            val currentScene by collectLastValue(sceneInteractor.currentScene)

            prepareState()

            assertThat(currentScene).isEqualTo(Scenes.Lockscreen)

            underTest.start()



            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)

            runCurrent()



            assertThat(currentScene).isEqualTo(Scenes.Gone)

        }



    @Test

    fun switchToGone_whenKeyguardBecomesDisabled_whenOnShadeScene() =

        testScope.runTest {

            val currentScene by collectLastValue(sceneInteractor.currentScene)

            prepareState(

                initialSceneKey = Scenes.Shade,

            )

            assertThat(currentScene).isEqualTo(Scenes.Shade)

            underTest.start()



            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)

            runCurrent()



            assertThat(currentScene).isEqualTo(Scenes.Gone)

        }



    @Test

    fun doesNotSwitchToGone_whenKeyguardBecomesDisabled_whenInLockdownMode() =

        testScope.runTest {

            val currentScene by collectLastValue(sceneInteractor.currentScene)

            prepareState()

            assertThat(currentScene).isEqualTo(Scenes.Lockscreen)

            underTest.start()



            kosmos.fakeBiometricSettingsRepository.setIsFaceAuthEnrolledAndEnabled(true)

            kosmos.fakeBiometricSettingsRepository.setIsUserInLockdown(true)

            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)

            runCurrent()



            assertThat(currentScene).isEqualTo(Scenes.Lockscreen)

        }



    @Test

    fun doesNotSwitchToGone_whenKeyguardBecomesDisabled_whenDeviceEntered() =

        testScope.runTest {

            val currentScene by collectLastValue(sceneInteractor.currentScene)

            prepareState(

                isDeviceUnlocked = true,

                initialSceneKey = Scenes.Gone,

            )

            assertThat(currentScene).isEqualTo(Scenes.Gone)

            assertThat(kosmos.deviceEntryInteractor.isDeviceEntered.value).isTrue()

            underTest.start()

            sceneInteractor.changeScene(Scenes.Shade, "")

            assertThat(currentScene).isEqualTo(Scenes.Shade)

            assertThat(kosmos.deviceEntryInteractor.isDeviceEntered.value).isTrue()



            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)

            runCurrent()



            assertThat(currentScene).isEqualTo(Scenes.Shade)

        }



    @Test

    fun switchToLockscreen_whenKeyguardBecomesEnabled_afterHidingWhenDisabled() =

        testScope.runTest {

            val currentScene by collectLastValue(sceneInteractor.currentScene)

            prepareState()

            assertThat(currentScene).isEqualTo(Scenes.Lockscreen)

            underTest.start()

            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)

            runCurrent()

            assertThat(currentScene).isEqualTo(Scenes.Gone)



            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(true)

            runCurrent()



            assertThat(currentScene).isEqualTo(Scenes.Lockscreen)

        }



    @Test

    fun doesNotSwitchToLockscreen_whenKeyguardBecomesEnabled_ifAuthMethodBecameInsecure() =

        testScope.runTest {

            val currentScene by collectLastValue(sceneInteractor.currentScene)

            prepareState()

            assertThat(currentScene).isEqualTo(Scenes.Lockscreen)

            underTest.start()

            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)

            runCurrent()

            assertThat(currentScene).isEqualTo(Scenes.Gone)

            kosmos.fakeAuthenticationRepository.setAuthenticationMethod(

                AuthenticationMethodModel.None

            )

            runCurrent()



            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(true)

            runCurrent()



            assertThat(currentScene).isEqualTo(Scenes.Gone)

        }



    private fun TestScope.emulateSceneTransition(

    private fun TestScope.emulateSceneTransition(

        transitionStateFlow: MutableStateFlow<ObservableTransitionState>,

        transitionStateFlow: MutableStateFlow<ObservableTransitionState>,

        toScene: SceneKey,

        toScene: SceneKey,
@@ -1381,16 +1489,11 @@ class SceneContainerStartableTest : SysuiTestCase() { 
        isDeviceProvisioned: Boolean = true,

        isDeviceProvisioned: Boolean = true,

        isInteractive: Boolean = true,

        isInteractive: Boolean = true,

    ): MutableStateFlow<ObservableTransitionState> {

    ): MutableStateFlow<ObservableTransitionState> {

        if (authenticationMethod?.isSecure == true) {

            assert(isLockscreenEnabled) {

                "Lockscreen cannot be disabled while having a secure authentication method"

            }

        if (isDeviceUnlocked) {

        if (isDeviceUnlocked) {

            kosmos.deviceEntryFingerprintAuthRepository.setAuthenticationStatus(

            kosmos.deviceEntryFingerprintAuthRepository.setAuthenticationStatus(

                SuccessFingerprintAuthenticationStatus(0, true)

                SuccessFingerprintAuthenticationStatus(0, true)

            )

            )

        }

        }

        }





        check(initialSceneKey != Scenes.Gone || isDeviceUnlocked) {

        check(initialSceneKey != Scenes.Gone || isDeviceUnlocked) {

            "Cannot start on the Gone scene and have the device be locked at the same time."

            "Cannot start on the Gone scene and have the device be locked at the same time."

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt

+16 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepositor 
import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor

import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

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

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

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

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.testScope

import com.android.systemui.media.controls.data.repository.mediaFilterRepository

import com.android.systemui.media.controls.data.repository.mediaFilterRepository
@@ -138,6 +139,21 @@ class ShadeSceneViewModelTest : SysuiTestCase() { 
            assertThat(homeScene).isEqualTo(Scenes.Gone)

            assertThat(homeScene).isEqualTo(Scenes.Gone)

        }

        }





    @Test

    fun upTransitionSceneKey_keyguardDisabled_gone() =

        testScope.runTest {

            val destinationScenes by collectLastValue(underTest.destinationScenes)

            val homeScene by collectLastValue(kosmos.homeSceneFamilyResolver.resolvedScene)

            kosmos.fakeAuthenticationRepository.setAuthenticationMethod(

                AuthenticationMethodModel.Pin

            )

            kosmos.keyguardEnabledInteractor.notifyKeyguardEnabled(false)



            assertThat(destinationScenes?.get(Swipe(SwipeDirection.Up))?.toScene)

                .isEqualTo(SceneFamilies.Home)

            assertThat(homeScene).isEqualTo(Scenes.Gone)

        }



    @Test

    @Test

    fun upTransitionSceneKey_authMethodSwipe_lockscreenNotDismissed_goesToLockscreen() =

    fun upTransitionSceneKey_authMethodSwipe_lockscreenNotDismissed_goesToLockscreen() =

        testScope.runTest {

        testScope.runTest {