diff options
11 files changed, 29 insertions, 43 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt index 3fd1c20c0560..d9708a4f5506 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt @@ -362,6 +362,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest } @Test + @DisableSceneContainer fun dreamingLockscreenHostedToLockscreen() = testScope.runTest { // GIVEN a device dreaming with the lockscreen hosted dream and not dozing @@ -449,6 +450,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest } @Test + @DisableSceneContainer fun dreamingLockscreenHostedToDozing() = testScope.runTest { // GIVEN a device is dreaming with lockscreen hosted dream @@ -480,6 +482,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest } @Test + @DisableSceneContainer fun dreamingLockscreenHostedToOccluded() = testScope.runTest { // GIVEN device is dreaming with lockscreen hosted dream and not occluded @@ -977,6 +980,7 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest } @Test + @DisableSceneContainer fun alternateBouncerToGlanceableHub() = testScope.runTest { // GIVEN the device is idle on the glanceable hub diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt index b44a8cf70328..a915241fc646 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt @@ -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.Edge import com.android.systemui.keyguard.shared.model.KeyguardState -import com.android.systemui.keyguard.shared.model.TransitionStep import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.scene.shared.model.Scenes @@ -91,12 +90,12 @@ constructor( edgeWithoutSceneContainer = Edge.create(from = KeyguardState.ALTERNATE_BOUNCER, to = KeyguardState.GONE) ) - .map<TransitionStep, Boolean?> { + .map { // The alt bouncer is pretty fast to hide, so start the surface behind animation // around 30%. it.value > 0.3f } - .onStart { + .onStart<Boolean?> { // Default to null ("don't care, use a reasonable default"). emit(null) } @@ -145,6 +144,7 @@ constructor( } } else { if (isIdleOnCommunal) { + if (SceneContainerFlag.isEnabled) return@collect KeyguardState.GLANCEABLE_HUB } else if (isOccluded) { KeyguardState.OCCLUDED @@ -158,7 +158,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. @@ -170,9 +169,9 @@ constructor( keyguardInteractor.isKeyguardGoingAway.filter { it }.map {}, // map to Unit keyguardInteractor.isKeyguardOccluded.flatMapLatest { keyguardOccluded -> if (keyguardOccluded) { - primaryBouncerInteractor.keyguardAuthenticatedBiometricsHandled.drop( - 1 - ) // drop the initial state + primaryBouncerInteractor.keyguardAuthenticatedBiometricsHandled + // drop the initial state + .drop(1) } else { emptyFlow() } @@ -184,7 +183,6 @@ constructor( } private fun listenForAlternateBouncerToPrimaryBouncer() { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return scope.launch { keyguardInteractor.primaryBouncerShowing diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingLockscreenHostedTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingLockscreenHostedTransitionInteractor.kt index 117dbcfe52c8..f3bd0e9496b1 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingLockscreenHostedTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingLockscreenHostedTransitionInteractor.kt @@ -61,6 +61,7 @@ constructor( ) { override fun start() { + if (SceneContainerFlag.isEnabled) return listenForDreamingLockscreenHostedToLockscreen() listenForDreamingLockscreenHostedToGone() listenForDreamingLockscreenHostedToDozing() @@ -96,8 +97,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 } @@ -106,8 +105,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 -> diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt index 4c3a75e765b6..3775d191949e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt @@ -100,7 +100,6 @@ constructor( private fun listenForDreamingToGlanceableHub() { if (!communalSettingsInteractor.isCommunalFlagEnabled()) return - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return scope.launch("$TAG#listenForDreamingToGlanceableHub", mainDispatcher) { glanceableHubTransitions.listenForGlanceableHubTransition( @@ -195,7 +194,7 @@ constructor( private fun listenForDreamingToGoneWhenDismissable() { if (SceneContainerFlag.isEnabled) { - return // TODO(b/336576536): Check if adaptation for scene framework is needed + return } if (KeyguardWmStateRefactor.isEnabled) { @@ -217,7 +216,7 @@ constructor( } private fun listenForDreamingToGoneFromBiometricUnlock() { - // TODO(b/336576536): Check if adaptation for scene framework is needed + // TODO(b/353542570): Adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return scope.launch { keyguardInteractor.biometricUnlockState diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGlanceableHubTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGlanceableHubTransitionInteractor.kt index 6b1be93c988a..91ee2872fd22 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGlanceableHubTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGlanceableHubTransitionInteractor.kt @@ -75,7 +75,6 @@ constructor( ) { override fun start() { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return if (!communalSettingsInteractor.isCommunalFlagEnabled()) { return diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt index ef76f3837889..8f4110c7cc57 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt @@ -69,7 +69,7 @@ constructor( ) { override fun start() { - // TODO(b/336576536): Check if adaptation for scene framework is needed + // KeyguardState.GONE does not exist with SceneContainerFlag enabled if (SceneContainerFlag.isEnabled) return listenForGoneToAodOrDozing() listenForGoneToDreaming() @@ -100,21 +100,19 @@ constructor( } } - if (!SceneContainerFlag.isEnabled) { - scope.launch { - keyguardRepository.isKeyguardEnabled - .filterRelevantKeyguardStateAnd { enabled -> enabled } - .sample(keyguardEnabledInteractor.showKeyguardWhenReenabled) - .filter { reshow -> reshow } - .collect { - startTransitionTo( - KeyguardState.LOCKSCREEN, - ownerReason = - "Keyguard was re-enabled, and we weren't GONE when it " + - "was originally disabled" - ) - } - } + scope.launch { + keyguardRepository.isKeyguardEnabled + .filterRelevantKeyguardStateAnd { enabled -> enabled } + .sample(keyguardEnabledInteractor.showKeyguardWhenReenabled) + .filter { reshow -> reshow } + .collect { + startTransitionTo( + KeyguardState.LOCKSCREEN, + ownerReason = + "Keyguard was re-enabled, and we weren't GONE when it " + + "was originally disabled" + ) + } } } else { scope.launch("$TAG#listenForGoneToLockscreenOrHub") { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt index 16c014f451f3..206bbc51f793 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt @@ -351,7 +351,6 @@ constructor( * keyguard transition. */ private fun listenForLockscreenToGlanceableHub() { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return if (!communalSettingsInteractor.isCommunalFlagEnabled()) { return diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromOccludedTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromOccludedTransitionInteractor.kt index 2f320409f231..710b710aa7d5 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromOccludedTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromOccludedTransitionInteractor.kt @@ -143,7 +143,6 @@ constructor( if (restartDreamOnUnocclude() && dreamFromOccluded) { startTransitionTo(KeyguardState.DREAMING) } else if (isIdleOnCommunal || showCommunalFromOccluded) { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return if (communalSceneKtfRefactor()) { communalSceneInteractor.changeScene( @@ -159,8 +158,6 @@ constructor( } private fun listenForOccludedToGone() { - // TODO(b/336576536): Check if adaptation for scene framework is needed - if (SceneContainerFlag.isEnabled) return if (KeyguardWmStateRefactor.isEnabled) { // We don't think OCCLUDED to GONE is possible. You should always have to go via a // *_BOUNCER state to end up GONE. Launching an activity over a dismissable keyguard @@ -168,7 +165,8 @@ constructor( // If we're wrong - sorry, add it back here. return } - + // TODO(b/353545202): Adaptation for scene framework is needed + if (SceneContainerFlag.isEnabled) return scope.launch { keyguardInteractor.isKeyguardOccluded .sample(keyguardInteractor.isKeyguardShowing, ::Pair) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt index 9adcaa229ae2..e2d7851daf7e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt @@ -103,7 +103,6 @@ constructor( } private fun listenForPrimaryBouncerToLockscreenHubOrOccluded() { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return if (KeyguardWmStateRefactor.isEnabled) { scope.launch { @@ -177,13 +176,11 @@ constructor( } private fun listenForPrimaryBouncerToAsleep() { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return scope.launch { listenForSleepTransition() } } private fun listenForPrimaryBouncerToDreamingLockscreenHosted() { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return scope.launch { keyguardInteractor.primaryBouncerShowing @@ -197,7 +194,6 @@ constructor( } private fun listenForPrimaryBouncerToGone() { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return if (KeyguardWmStateRefactor.isEnabled) { // This is handled in KeyguardSecurityContainerController and diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/GlanceableHubTransitions.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/GlanceableHubTransitions.kt index af1ce2bfcdde..f9ab1bbcc741 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/GlanceableHubTransitions.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/GlanceableHubTransitions.kt @@ -50,7 +50,6 @@ constructor( fromState: KeyguardState, toState: KeyguardState, ) { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return val toScene = if (fromState == KeyguardState.GLANCEABLE_HUB) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt index f9bfaff80090..797d4667c56d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt @@ -398,7 +398,6 @@ constructor( * including KeyguardSecurityContainerController and WindowManager. */ fun startDismissKeyguardTransition(reason: String = "") { - // TODO(b/336576536): Check if adaptation for scene framework is needed if (SceneContainerFlag.isEnabled) return Log.d(TAG, "#startDismissKeyguardTransition(reason=$reason)") when (val startedState = repository.currentTransitionInfoInternal.value.to) { |