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

Commit 4afe405e authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] Home family resolver considers keyguard enabledness 

If the keyguard is disabled, the "home" family is resolved to Gone, not
Lockscreen.

Bug: 348644111
Test: added unit tests
Flag: com.android.systemui.scene_container
Change-Id: Ic3e6d4b7214056f03930c1f03dd01663abde750a
parent 45830862

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

+12 −0
Original line number 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.flags.EnableSceneContainer

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.kosmos.testScope

import com.android.systemui.scene.domain.interactor.sceneInteractor
@@ -69,6 +70,17 @@ class NotificationsShadeSceneViewModelTest : SysuiTestCase() { 
                .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

    fun upTransitionSceneKey_deviceUnlocked_gone() =

        testScope.runTest {

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

+32 −0
Original line number 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.fakeFeatureFlagsClassic

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.kosmos.testScope

import com.android.systemui.media.controls.data.repository.mediaFilterRepository
@@ -159,6 +160,37 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { 
            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.QuickSettings)

            assertThat(backScene).isEqualTo(Scenes.Lockscreen)

            assertThat(destinations)

                .isEqualTo(

                    mapOf(

                        Back to UserActionResult(Scenes.Lockscreen),

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

                        Swipe(

                            fromSource = Edge.Bottom,

                            direction = SwipeDirection.Up,

                        ) to UserActionResult(SceneFamilies.Home)

                    )

                )

            assertThat(homeScene).isEqualTo(Scenes.Gone)

        }



    @Test

    fun destinations_whenNotCustomizing_authMethodSwipe_lockscreenNotDismissed() =

        testScope.runTest {

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

+13 −0
Original line number 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.flags.EnableSceneContainer

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.kosmos.testScope

import com.android.systemui.scene.domain.interactor.sceneInteractor
@@ -69,6 +70,18 @@ class QuickSettingsShadeSceneViewModelTest : SysuiTestCase() { 
            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

    fun upTransitionSceneKey_deviceUnlocked_gone() =

        testScope.runTest {

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

+16 −0
Original line number 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.flags.EnableSceneContainer

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.kosmos.testScope

import com.android.systemui.media.controls.data.repository.mediaFilterRepository
@@ -138,6 +139,21 @@ class ShadeSceneViewModelTest : SysuiTestCase() { 
            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

    fun upTransitionSceneKey_authMethodSwipe_lockscreenNotDismissed_goesToLockscreen() =

        testScope.runTest {

packages/SystemUI/src/com/android/systemui/scene/domain/resolver/HomeSceneFamilyResolver.kt

+9 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.compose.animation.scene.SceneKey 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

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

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

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

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

import dagger.Binds
@@ -45,11 +46,13 @@ class HomeSceneFamilyResolver 
constructor(

    @Application private val applicationScope: CoroutineScope,

    deviceEntryInteractor: DeviceEntryInteractor,

    keyguardEnabledInteractor: KeyguardEnabledInteractor,

) : SceneResolver {

    override val targetFamily: SceneKey = SceneFamilies.Home



    override val resolvedScene: StateFlow<SceneKey> =

        combine(

                keyguardEnabledInteractor.isKeyguardEnabled,

                deviceEntryInteractor.canSwipeToEnter,

                deviceEntryInteractor.isDeviceEntered,

                deviceEntryInteractor.isUnlocked,
@@ -60,20 +63,23 @@ constructor( 
                started = SharingStarted.Eagerly,

                initialValue =

                    homeScene(

                        deviceEntryInteractor.canSwipeToEnter.value,

                        deviceEntryInteractor.isDeviceEntered.value,

                        deviceEntryInteractor.isUnlocked.value,

                        isKeyguardEnabled = keyguardEnabledInteractor.isKeyguardEnabled.value,

                        canSwipeToEnter = deviceEntryInteractor.canSwipeToEnter.value,

                        isDeviceEntered = deviceEntryInteractor.isDeviceEntered.value,

                        isUnlocked = deviceEntryInteractor.isUnlocked.value,

                    )

            )



    override fun includesScene(scene: SceneKey): Boolean = scene in homeScenes



    private fun homeScene(

        isKeyguardEnabled: Boolean,

        canSwipeToEnter: Boolean?,

        isDeviceEntered: Boolean,

        isUnlocked: Boolean,

    ): SceneKey =

        when {

            !isKeyguardEnabled -> Scenes.Gone

            canSwipeToEnter == true -> Scenes.Lockscreen

            !isDeviceEntered -> Scenes.Lockscreen

            !isUnlocked -> Scenes.Lockscreen