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

Commit e9fd2072 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

* changes:
  Revert^2 "Fix WindowManagerLockscreenVisibility"
  Revert^2 "Flag off all edges leading KTF out of the Lockscreen scene"
parents 56bd6c65 92b7ff77

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

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

         */

        val isUserInputOngoing: Flow<Boolean>,

        val isUserInputOngoing: Flow<Boolean>,

    ) : ObservableTransitionState

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

+5 −0
Original line number Original line 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.data.repository.KeyguardTransitionRepository

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

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

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

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.Utils.Companion.sample as sampleCombine

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

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

import javax.inject.Inject

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

    }





    private fun listenForAlternateBouncerToGone() {

    private fun listenForAlternateBouncerToGone() {

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

        if (SceneContainerFlag.isEnabled) return

        if (KeyguardWmStateRefactor.isEnabled) {

        if (KeyguardWmStateRefactor.isEnabled) {

            // Handled via #dismissAlternateBouncer.

            // Handled via #dismissAlternateBouncer.

            return

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

    }





    private fun listenForAlternateBouncerToPrimaryBouncer() {

    private fun listenForAlternateBouncerToPrimaryBouncer() {

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

        if (SceneContainerFlag.isEnabled) return

        scope.launch {

        scope.launch {

            keyguardInteractor.primaryBouncerShowing

            keyguardInteractor.primaryBouncerShowing

                .filterRelevantKeyguardStateAnd { isPrimaryBouncerShowing ->

                .filterRelevantKeyguardStateAnd { isPrimaryBouncerShowing ->

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

+2 −0
Original line number Original line 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.KeyguardState

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

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

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

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 com.android.systemui.util.kotlin.Utils.Companion.sample

import javax.inject.Inject

import javax.inject.Inject

import kotlin.time.Duration.Companion.milliseconds

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

     * PRIMARY_BOUNCER.

     */

     */

    private fun listenForAodToPrimaryBouncer() {

    private fun listenForAodToPrimaryBouncer() {

        if (SceneContainerFlag.isEnabled) return

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

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

            keyguardInteractor.primaryBouncerShowing

            keyguardInteractor.primaryBouncerShowing

                .filterRelevantKeyguardStateAnd { primaryBouncerShowing -> primaryBouncerShowing }

                .filterRelevantKeyguardStateAnd { primaryBouncerShowing -> primaryBouncerShowing }

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

+5 −0
Original line number Original line 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.DozeStateModel

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

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

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

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

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

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

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

import javax.inject.Inject

import javax.inject.Inject

import kotlin.time.Duration.Companion.milliseconds

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

    }





    private fun listenForDreamingLockscreenHostedToPrimaryBouncer() {

    private fun listenForDreamingLockscreenHostedToPrimaryBouncer() {

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

        if (SceneContainerFlag.isEnabled) return

        scope.launch {

        scope.launch {

            keyguardInteractor.primaryBouncerShowing

            keyguardInteractor.primaryBouncerShowing

                .filterRelevantKeyguardStateAnd { isBouncerShowing -> isBouncerShowing }

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

    }





    private fun listenForDreamingLockscreenHostedToGone() {

    private fun listenForDreamingLockscreenHostedToGone() {

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

        if (SceneContainerFlag.isEnabled) return

        scope.launch {

        scope.launch {

            keyguardInteractor.biometricUnlockState

            keyguardInteractor.biometricUnlockState

                .filterRelevantKeyguardStateAnd { biometricUnlockState ->

                .filterRelevantKeyguardStateAnd { biometricUnlockState ->

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

+7 −0
Original line number Original line 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.DozeStateModel

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

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

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

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.Utils.Companion.sample as sampleCombine

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

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

import javax.inject.Inject

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




    private fun listenForDreamingToGlanceableHub() {

    private fun listenForDreamingToGlanceableHub() {

        if (!communalHub()) return

        if (!communalHub()) return

        if (SceneContainerFlag.isEnabled)

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

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

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

            glanceableHubTransitions.listenForGlanceableHubTransition(

            glanceableHubTransitions.listenForGlanceableHubTransition(

                transitionOwnerName = TAG,

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

    }





    private fun listenForDreamingToGoneWhenDismissable() {

    private fun listenForDreamingToGoneWhenDismissable() {

        if (SceneContainerFlag.isEnabled)

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

        scope.launch {

        scope.launch {

            keyguardInteractor.isAbleToDream

            keyguardInteractor.isAbleToDream

                .sampleCombine(

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

    }





    private fun listenForDreamingToGoneFromBiometricUnlock() {

    private fun listenForDreamingToGoneFromBiometricUnlock() {

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

        if (SceneContainerFlag.isEnabled) return

        scope.launch {

        scope.launch {

            keyguardInteractor.biometricUnlockState

            keyguardInteractor.biometricUnlockState

                .filterRelevantKeyguardStateAnd { biometricUnlockState ->

                .filterRelevantKeyguardStateAnd { biometricUnlockState ->