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

Commit 1b01fb33 authored by Matt Pietal's avatar Matt Pietal
Browse files

Ensure transition to GONE from ALTERNATE_BOUNCER 

This is a failsafe for an unexpected path when launching an
activity from the glanceable hub.

Test: manual
Bug: 384572679
Flag: EXEMPT bugfix
Change-Id: I43e10108c69980398757d7c14b23d23fd480b005
parent 623fd00c

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

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.systemui.keyguard.shared.model.DozeStateModel.Companion.isDoz 
import com.android.systemui.keyguard.shared.model.DozeTransitionModel

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

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

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

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

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

import com.android.systemui.keyguard.shared.model.KeyguardState.GLANCEABLE_HUB
@@ -93,6 +94,8 @@ constructor( 
    private val fromGoneTransitionInteractor: Provider<FromGoneTransitionInteractor>,

    private val fromLockscreenTransitionInteractor: Provider<FromLockscreenTransitionInteractor>,

    private val fromOccludedTransitionInteractor: Provider<FromOccludedTransitionInteractor>,

    private val fromAlternateBouncerTransitionInteractor:

        Provider<FromAlternateBouncerTransitionInteractor>,

    @Application applicationScope: CoroutineScope,

) {

    // TODO(b/296118689): move to a repository
@@ -526,6 +529,8 @@ constructor( 
        when (keyguardTransitionInteractor.transitionState.value.to) {

            LOCKSCREEN -> fromLockscreenTransitionInteractor.get().dismissKeyguard()

            OCCLUDED -> fromOccludedTransitionInteractor.get().dismissFromOccluded()

            ALTERNATE_BOUNCER ->

                fromAlternateBouncerTransitionInteractor.get().dismissAlternateBouncer()

            else -> Log.v(TAG, "Keyguard was dismissed, no direct transition call needed")

        }

    }

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ object KeyguardInteractorFactory { 
        fromGoneTransitionInteractor: FromGoneTransitionInteractor = mock(),

        fromLockscreenTransitionInteractor: FromLockscreenTransitionInteractor = mock(),

        fromOccludedTransitionInteractor: FromOccludedTransitionInteractor = mock(),

        fromAlternateBouncerTransitionInteractor: FromAlternateBouncerTransitionInteractor = mock(),

        powerInteractor: PowerInteractor = PowerInteractorFactory.create().powerInteractor,

        testScope: CoroutineScope = TestScope(),

    ): WithDependencies {
@@ -84,6 +85,9 @@ object KeyguardInteractorFactory { 
                fromGoneTransitionInteractor = { fromGoneTransitionInteractor },

                fromLockscreenTransitionInteractor = { fromLockscreenTransitionInteractor },

                fromOccludedTransitionInteractor = { fromOccludedTransitionInteractor },

                fromAlternateBouncerTransitionInteractor = {

                    fromAlternateBouncerTransitionInteractor

                },

                applicationScope = testScope,

            ),

        )

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorKosmos.kt

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ val Kosmos.keyguardInteractor: KeyguardInteractor by 
            fromGoneTransitionInteractor = { fromGoneTransitionInteractor },

            fromLockscreenTransitionInteractor = { fromLockscreenTransitionInteractor },

            fromOccludedTransitionInteractor = { fromOccludedTransitionInteractor },

            fromAlternateBouncerTransitionInteractor = { fromAlternateBouncerTransitionInteractor },

            applicationScope = testScope.backgroundScope,

        )

    }