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

Commit 0eeefda6 authored by Andreas Miko's avatar Andreas Miko
Browse files

Move asleepKeyguardState to KeyguardInteractor 

asleepKeyguardState is not related to observing the the KTF state

Bug: 349784682
Flag: EXEMPT refactor
Test: REFACTOR_ONLY
Change-Id: I9f79851dccb10042bd7440aaf10271b5c805807a
parent 5cce2ad0

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

+3 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import com.android.systemui.keyguard.data.repository.keyguardRepository 
import com.android.systemui.keyguard.data.repository.keyguardTransitionRepository

import com.android.systemui.keyguard.dismissCallbackRegistry

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

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

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

import com.android.systemui.keyguard.domain.interactor.scenetransition.lockscreenSceneTransitionInteractor

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

import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus
@@ -551,8 +551,7 @@ class SceneContainerStartableTest : SysuiTestCase() { 
    fun switchToAOD_whenAvailable_whenDeviceSleepsLocked() =

        testScope.runTest {

            kosmos.lockscreenSceneTransitionInteractor.start()

            val asleepState by

                collectLastValue(kosmos.keyguardTransitionInteractor.asleepKeyguardState)

            val asleepState by collectLastValue(kosmos.keyguardInteractor.asleepKeyguardState)

            val currentTransitionInfo by

                collectLastValue(kosmos.keyguardTransitionRepository.currentTransitionInfoInternal)

            val transitionState =
@@ -584,8 +583,7 @@ class SceneContainerStartableTest : SysuiTestCase() { 
    fun switchToDozing_whenAodUnavailable_whenDeviceSleepsLocked() =

        testScope.runTest {

            kosmos.lockscreenSceneTransitionInteractor.start()

            val asleepState by

                collectLastValue(kosmos.keyguardTransitionInteractor.asleepKeyguardState)

            val asleepState by collectLastValue(kosmos.keyguardInteractor.asleepKeyguardState)

            val currentTransitionInfo by

                collectLastValue(kosmos.keyguardTransitionRepository.currentTransitionInfoInternal)

            val transitionState =

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

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ constructor( 
            listenForSleepTransition(

                modeOnCanceledFromStartedStep = { startedStep ->

                    if (

                        transitionInteractor.asleepKeyguardState.value == KeyguardState.AOD &&

                        keyguardInteractor.asleepKeyguardState.value == KeyguardState.AOD &&

                            startedStep.from == KeyguardState.AOD

                    ) {

                        TransitionModeOnCanceled.REVERSE

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

+8 −0
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ import com.android.systemui.keyguard.shared.model.DozeStateModel 
import com.android.systemui.keyguard.shared.model.DozeStateModel.Companion.isDozeOff

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.AOD

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

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

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

import com.android.systemui.keyguard.shared.model.KeyguardState.OCCLUDED
@@ -409,6 +411,12 @@ constructor( 
        }

    }



    /** Which keyguard state to use when the device goes to sleep. */

    val asleepKeyguardState: StateFlow<KeyguardState> =

        repository.isAodAvailable

            .map { aodAvailable -> if (aodAvailable) AOD else DOZING }

            .stateIn(applicationScope, SharingStarted.Eagerly, DOZING)



    /**

     * Whether the primary authentication is required for the given user due to lockdown or

     * encryption after reboot.

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

+0 −8
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.util.Log 
import com.android.compose.animation.scene.SceneKey

import com.android.systemui.dagger.SysUISingleton

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

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

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

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

import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -69,7 +68,6 @@ class KeyguardTransitionInteractor 
@Inject

constructor(

    @Application val scope: CoroutineScope,

    private val keyguardRepository: KeyguardRepository,

    private val repository: KeyguardTransitionRepository,

    private val fromLockscreenTransitionInteractor: dagger.Lazy<FromLockscreenTransitionInteractor>,

    private val fromPrimaryBouncerTransitionInteractor:
@@ -308,12 +306,6 @@ constructor( 
            .buffer(2, BufferOverflow.DROP_OLDEST)

            .shareIn(scope, SharingStarted.Eagerly, replay = 1)



    /** Which keyguard state to use when the device goes to sleep. */

    val asleepKeyguardState: StateFlow<KeyguardState> =

        keyguardRepository.isAodAvailable

            .map { aodAvailable -> if (aodAvailable) AOD else DOZING }

            .stateIn(scope, SharingStarted.Eagerly, DOZING)



    /**

     * The last [KeyguardState] to which we [TransitionState.FINISHED] a transition.

     *

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

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ sealed class TransitionInteractor( 
            .map(modeOnCanceledFromStartedStep)

            .collect { modeOnCanceled ->

                startTransitionTo(

                    toState = transitionInteractor.asleepKeyguardState.value,

                    toState = keyguardInteractor.asleepKeyguardState.value,

                    modeOnCanceled = modeOnCanceled,

                    ownerReason = "Sleep transition triggered"

                )