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

Commit d618dc57 authored by Priyanka Advani's avatar Priyanka Advani
Browse files

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

Revert submission 27057737

Reason for revert: Droid-monitor created revert due to breakages in b/339822929. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:27057737

Change-Id: I9d5eb13c5f19f348efa98fab9cbad7e6db7a5d41
parent fac6c127

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

+0 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 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
@@ -141,8 +140,6 @@ 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
@@ -165,8 +162,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 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
@@ -186,7 +185,6 @@ 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

+0 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 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
@@ -94,8 +93,6 @@ 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 }
@@ -104,8 +101,6 @@ 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

+0 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 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
@@ -89,8 +88,6 @@ 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,
@@ -178,8 +175,6 @@ constructor( 
    }



    private fun listenForDreamingToGoneWhenDismissable() {

        if (SceneContainerFlag.isEnabled)

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

        scope.launch {

            keyguardInteractor.isAbleToDream

                .sampleCombine(
@@ -195,8 +190,6 @@ 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

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 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
@@ -63,8 +62,6 @@ constructor( 
    ) {



    override fun start() {

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

        if (SceneContainerFlag.isEnabled) return

        if (!Flags.communalHub()) {

            return

        }