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

Commit 902202b4 authored by Andreas Miko's avatar Andreas Miko
Browse files

Revert^2 "Flag off all edges leading KTF out of the Lockscreen scene" 

This CL flags off all edges to states that are not part of the
Lockscreen scene in Flexiglass. We will introduce a new state and
corresponding edges representing the "outside" states in a later CL.

Revert submission 27303196-revert-27057737-VHSLSLTGYG

Reason for revert: revert^2 with fixed tests

Reverted changes: /q/submissionid:27303196-revert-27057737-VHSLSLTGYG

Test: Manual and unit tests of the follow up CLs
Bug: b/330311871
Bug: b/336576536
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Change-Id: Ib501f82017a946c29852ee560763a6de17a7c8df
parent c7942f24

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

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.systemui.keyguard.KeyguardWmStateRefactor 
import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository

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

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.util.kotlin.Utils.Companion.sample as sampleCombine

import com.android.wm.shell.animation.Interpolators

import javax.inject.Inject
@@ -140,6 +141,8 @@ constructor( 
    }



    private fun listenForAlternateBouncerToGone() {

        // TODO(b/336576536): Check if adaptation for scene framework is needed

        if (SceneContainerFlag.isEnabled) return

        if (KeyguardWmStateRefactor.isEnabled) {

            // Handled via #dismissAlternateBouncer.

            return
@@ -162,6 +165,8 @@ constructor( 
    }



    private fun listenForAlternateBouncerToPrimaryBouncer() {

        // TODO(b/336576536): Check if adaptation for scene framework is needed

        if (SceneContainerFlag.isEnabled) return

        scope.launch {

            keyguardInteractor.primaryBouncerShowing

                .filterRelevantKeyguardStateAnd { isPrimaryBouncerShowing ->

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.keyguard.shared.model.BiometricUnlockMode.Companion. 
import com.android.systemui.keyguard.shared.model.KeyguardState

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

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.util.kotlin.Utils.Companion.sample

import javax.inject.Inject

import kotlin.time.Duration.Companion.milliseconds
@@ -185,6 +186,7 @@ constructor( 
     * PRIMARY_BOUNCER.

     */

    private fun listenForAodToPrimaryBouncer() {

        if (SceneContainerFlag.isEnabled) return

        scope.launch("$TAG#listenForAodToPrimaryBouncer") {

            keyguardInteractor.primaryBouncerShowing

                .filterRelevantKeyguardStateAnd { primaryBouncerShowing -> primaryBouncerShowing }

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

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.systemui.keyguard.shared.model.BiometricUnlockMode 
import com.android.systemui.keyguard.shared.model.DozeStateModel

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

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.util.kotlin.sample

import javax.inject.Inject

import kotlin.time.Duration.Companion.milliseconds
@@ -93,6 +94,8 @@ constructor( 
    }



    private fun listenForDreamingLockscreenHostedToPrimaryBouncer() {

        // TODO(b/336576536): Check if adaptation for scene framework is needed

        if (SceneContainerFlag.isEnabled) return

        scope.launch {

            keyguardInteractor.primaryBouncerShowing

                .filterRelevantKeyguardStateAnd { isBouncerShowing -> isBouncerShowing }
@@ -101,6 +104,8 @@ constructor( 
    }



    private fun listenForDreamingLockscreenHostedToGone() {

        // TODO(b/336576536): Check if adaptation for scene framework is needed

        if (SceneContainerFlag.isEnabled) return

        scope.launch {

            keyguardInteractor.biometricUnlockState

                .filterRelevantKeyguardStateAnd { biometricUnlockState ->

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

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.systemui.keyguard.shared.model.BiometricUnlockMode 
import com.android.systemui.keyguard.shared.model.DozeStateModel

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

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.util.kotlin.Utils.Companion.sample as sampleCombine

import com.android.systemui.util.kotlin.sample

import javax.inject.Inject
@@ -88,6 +89,8 @@ constructor( 


    private fun listenForDreamingToGlanceableHub() {

        if (!communalHub()) return

        if (SceneContainerFlag.isEnabled)

            return // TODO(b/336576536): Check if adaptation for scene framework is needed

        scope.launch("$TAG#listenForDreamingToGlanceableHub", mainDispatcher) {

            glanceableHubTransitions.listenForGlanceableHubTransition(

                transitionOwnerName = TAG,
@@ -175,6 +178,8 @@ constructor( 
    }



    private fun listenForDreamingToGoneWhenDismissable() {

        if (SceneContainerFlag.isEnabled)

            return // TODO(b/336576536): Check if adaptation for scene framework is needed

        scope.launch {

            keyguardInteractor.isAbleToDream

                .sampleCombine(
@@ -190,6 +195,8 @@ constructor( 
    }



    private fun listenForDreamingToGoneFromBiometricUnlock() {

        // TODO(b/336576536): Check if adaptation for scene framework is needed

        if (SceneContainerFlag.isEnabled) return

        scope.launch {

            keyguardInteractor.biometricUnlockState

                .filterRelevantKeyguardStateAnd { biometricUnlockState ->

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

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor 
import com.android.systemui.keyguard.shared.model.KeyguardState

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

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.util.kotlin.BooleanFlowOperators.allOf

import com.android.systemui.util.kotlin.BooleanFlowOperators.not

import javax.inject.Inject
@@ -62,6 +63,8 @@ constructor( 
    ) {



    override fun start() {

        // TODO(b/336576536): Check if adaptation for scene framework is needed

        if (SceneContainerFlag.isEnabled) return

        if (!Flags.communalHub()) {

            return

        }