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

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

Merge changes I95d9f220,Ia1f68dc1,I3606a217,Id12cfed1 into main 

* changes:
  [flexiglass] Invoke IKeyguardDismissCallbacks
  [flexiglass] Bouncer scene cannot be occluded
  [flexiglass] SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED when occluded
  [flexiglass] StatusBarState is SHADE when occluded.
parents f473639e 6656e1db

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

+56 −0
Original line number Diff line number Diff line
@@ -26,14 +26,18 @@ import androidx.test.filters.SmallTest 
import com.android.compose.animation.scene.ObservableTransitionState

import com.android.compose.animation.scene.SceneKey

import com.android.internal.logging.uiEventLoggerFake

import com.android.internal.policy.IKeyguardDismissCallback

import com.android.systemui.SysuiTestCase

import com.android.systemui.authentication.data.repository.FakeAuthenticationRepository

import com.android.systemui.authentication.data.repository.fakeAuthenticationRepository

import com.android.systemui.authentication.domain.interactor.authenticationInteractor

import com.android.systemui.authentication.shared.model.AuthenticationMethodModel

import com.android.systemui.bouncer.domain.interactor.bouncerInteractor

import com.android.systemui.bouncer.shared.logging.BouncerUiEvent

import com.android.systemui.classifier.FalsingCollector

import com.android.systemui.classifier.falsingCollector

import com.android.systemui.classifier.falsingManager

import com.android.systemui.concurrency.fakeExecutor

import com.android.systemui.coroutines.collectLastValue

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

import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor
@@ -44,6 +48,7 @@ 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.dismissCallbackRegistry

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

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

import com.android.systemui.kosmos.testScope
@@ -486,6 +491,11 @@ class SceneContainerStartableTest : SysuiTestCase() { 
                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING != 0L

                )

                .isFalse()

            assertThat(

                    sysUiState.flags and

                        QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED != 0L

                )

                .isFalse()



            kosmos.keyguardOcclusionInteractor.setWmNotifiedShowWhenLockedActivityOnTop(false)

            runCurrent()
@@ -499,6 +509,11 @@ class SceneContainerStartableTest : SysuiTestCase() { 
                        QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING != 0L

                )

                .isTrue()

            assertThat(

                    sysUiState.flags and

                        QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED != 0L

                )

                .isTrue()

        }



    @Test
@@ -1447,6 +1462,47 @@ class SceneContainerStartableTest : SysuiTestCase() { 
            assertThat(currentScene).isEqualTo(Scenes.Gone)

        }



    @Test

    fun notifyKeyguardDismissCallbacks_whenUnlocking_onDismissSucceeded() =

        testScope.runTest {

            val currentScene by collectLastValue(sceneInteractor.currentScene)

            prepareState()

            underTest.start()

            val dismissCallback: IKeyguardDismissCallback = mock()

            kosmos.dismissCallbackRegistry.addCallback(dismissCallback)



            // Switch to bouncer and unlock device:

            sceneInteractor.changeScene(Scenes.Bouncer, "")

            assertThat(currentScene).isEqualTo(Scenes.Bouncer)

            kosmos.authenticationInteractor.authenticate(FakeAuthenticationRepository.DEFAULT_PIN)

            assertThat(currentScene).isEqualTo(Scenes.Gone)

            kosmos.fakeExecutor.runAllReady()



            verify(dismissCallback).onDismissSucceeded()

        }



    @Test

    fun notifyKeyguardDismissCallbacks_whenLeavingBouncer_onDismissCancelled() =

        testScope.runTest {

            val currentScene by collectLastValue(sceneInteractor.currentScene)

            prepareState()

            underTest.start()

            val dismissCallback: IKeyguardDismissCallback = mock()

            kosmos.dismissCallbackRegistry.addCallback(dismissCallback)



            // Switch to bouncer:

            sceneInteractor.changeScene(Scenes.Bouncer, "")

            assertThat(currentScene).isEqualTo(Scenes.Bouncer)



            // Return to lockscreen:

            sceneInteractor.changeScene(Scenes.Lockscreen, "")

            assertThat(currentScene).isEqualTo(Scenes.Lockscreen)

            runCurrent()

            kosmos.fakeExecutor.runAllReady()



            verify(dismissCallback).onDismissCancelled()

        }



    private fun TestScope.emulateSceneTransition(

        transitionStateFlow: MutableStateFlow<ObservableTransitionState>,

        toScene: SceneKey,

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt

+44 −0
Original line number Diff line number Diff line
@@ -40,9 +40,11 @@ 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.plugins.statusbar.StatusBarStateController

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

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

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

import com.android.systemui.shade.domain.interactor.shadeInteractor

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

import com.android.systemui.testKosmos

import com.android.systemui.util.kotlin.JavaAdapter

import com.android.systemui.util.mockito.mock
@@ -105,6 +107,7 @@ class StatusBarStateControllerImplTest(flags: FlagsParameterization) : SysuiTest 
                    { kosmos.shadeInteractor },

                    { kosmos.deviceUnlockedInteractor },

                    { kosmos.sceneInteractor },

                    { kosmos.sceneContainerOcclusionInteractor },

                    { kosmos.keyguardClockInteractor },

                ) {

                override fun createDarkAnimator(): ObjectAnimator {
@@ -335,6 +338,47 @@ class StatusBarStateControllerImplTest(flags: FlagsParameterization) : SysuiTest 
            assertThat(statusBarState).isEqualTo(StatusBarState.SHADE)

        }



    @Test

    @EnableSceneContainer

    fun start_hydratesStatusBarState_whileOccluded() =

        testScope.runTest {

            var statusBarState = underTest.state

            val listener =

                object : StatusBarStateController.StateListener {

                    override fun onStateChanged(newState: Int) {

                        statusBarState = newState

                    }

                }

            underTest.addCallback(listener)



            val currentScene by collectLastValue(kosmos.sceneInteractor.currentScene)

            assertThat(currentScene).isEqualTo(Scenes.Lockscreen)

            val isOccluded by

                collectLastValue(kosmos.sceneContainerOcclusionInteractor.invisibleDueToOcclusion)

            kosmos.keyguardOcclusionInteractor.setWmNotifiedShowWhenLockedActivityOnTop(

                showWhenLockedActivityOnTop = true,

                taskInfo = mock(),

            )

            runCurrent()

            assertThat(isOccluded).isTrue()



            // Call start to begin hydrating based on the scene framework:

            underTest.start()



            kosmos.sceneInteractor.changeScene(toScene = Scenes.Shade, loggingReason = "reason")

            runCurrent()

            assertThat(currentScene).isEqualTo(Scenes.Shade)

            assertThat(statusBarState).isEqualTo(StatusBarState.SHADE)



            kosmos.sceneInteractor.changeScene(

                toScene = Scenes.QuickSettings,

                loggingReason = "reason"

            )

            runCurrent()

            assertThat(currentScene).isEqualTo(Scenes.QuickSettings)

            assertThat(statusBarState).isEqualTo(StatusBarState.SHADE)

        }



    @Test

    fun leaveOpenOnKeyguard_whenGone_isFalse() =

        testScope.runTest {

packages/SystemUI/src/com/android/systemui/model/SceneContainerPlugin.kt

+7 −3
Original line number Diff line number Diff line
@@ -84,9 +84,13 @@ constructor( 
                SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE to { it.scene != Scenes.Gone },

                SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED to

                    {

                        it.scene == Scenes.Lockscreen ||

                            it.scene == Scenes.NotificationsShade ||

                            it.scene == Scenes.Shade

                        when {

                            it.invisibleDueToOcclusion -> false

                            it.scene == Scenes.Lockscreen -> true

                            it.scene == Scenes.NotificationsShade -> true

                            it.scene == Scenes.Shade -> true

                            else -> false

                        }

                    },

                SYSUI_STATE_QUICK_SETTINGS_EXPANDED to

                    {

packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneContainerOcclusionInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ constructor( 
    private val SceneKey.canBeOccluded: Boolean

        get() =

            when (this) {

                Scenes.Bouncer -> true

                Scenes.Bouncer -> false

                Scenes.Communal -> true

                Scenes.Gone -> true

                Scenes.Lockscreen -> true

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

+15 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInt 
import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor

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

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.WindowManagerLockscreenVisibilityInteractor
@@ -126,6 +127,7 @@ constructor( 
    private val shadeSessionStorage: SessionStorage,

    private val windowMgrLockscreenVisInteractor: WindowManagerLockscreenVisibilityInteractor,

    private val keyguardEnabledInteractor: KeyguardEnabledInteractor,

    private val dismissCallbackRegistry: DismissCallbackRegistry,

) : CoreStartable {

    private val centralSurfaces: CentralSurfaces?

        get() = centralSurfacesOptLazy.get().getOrNull()
@@ -144,6 +146,7 @@ constructor( 
            hydrateBackStack()

            resetShadeSessions()

            handleKeyguardEnabledness()

            notifyKeyguardDismissCallbacks()

        } else {

            sceneLogger.logFrameworkEnabled(

                isEnabled = false,
@@ -713,4 +716,16 @@ constructor( 
            }

        }

    }



    private fun notifyKeyguardDismissCallbacks() {

        applicationScope.launch {

            sceneInteractor.currentScene.pairwise().collect { (from, to) ->

                when {

                    from != Scenes.Bouncer -> Unit

                    to == Scenes.Gone -> dismissCallbackRegistry.notifyDismissSucceeded()

                    else -> dismissCallbackRegistry.notifyDismissCancelled()

                }

            }

        }

    }

}