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

Commit 46393b9a authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-27057737-VHSLSLTGYG" into main 

* changes:
  Revert "Flag off all edges leading KTF out of the Lockscreen scene"
  Revert "Fix WindowManagerLockscreenVisibility"
parents 86c52bd1 d618dc57

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

+0 −10
Original line number Diff line number Diff line
@@ -74,16 +74,6 @@ sealed interface ObservableTransitionState { 
         */

        val isUserInputOngoing: Flow<Boolean>,

    ) : ObservableTransitionState



    fun isIdle(scene: SceneKey?): Boolean {

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

    }



    fun isTransitioning(from: SceneKey? = null, to: SceneKey? = null): Boolean {

        return this is Transition &&

            (from == null || this.fromScene == from) &&

            (to == null || this.toScene == to)

    }

}



/**

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