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

Commit ae8f24a3 authored by Andreas Miko's avatar Andreas Miko Committed by Android (Google) Code Review
Browse files

Merge changes I9f79851d,I91578f20 into main 

* changes:
  Move asleepKeyguardState to KeyguardInteractor
  [Flexiglass] Fix SharedNotificationContainerViewModel
parents a1bd4e8b 0eeefda6

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/ObservableTransitionState.kt

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ sealed interface ObservableTransitionState { 
        }

    }



    fun isIdle(scene: SceneKey?): Boolean {

    fun isIdle(scene: SceneKey? = null): Boolean {

        return this is Idle && (scene == null || this.currentScene == scene)

    }

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/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt

+165 −108

File changed.

Preview size limit exceeded, changes collapsed.

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.