[flexiglass] Update KTF scene framework TODOs (7e2b8900) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ constructor(
		(KeyguardWmStateRefactor.isEnabled && canWakeDirectlyToGone)

		if (shouldTransitionToGone) {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		// TODO(b/360368320): Adapt for scene framework
		if (SceneContainerFlag.isEnabled) return@collect
		startTransitionTo(
		toState = KeyguardState.GONE,
		@@ -186,7 +186,6 @@ constructor(
		* PRIMARY_BOUNCER.
		*/
		private fun listenForAodToPrimaryBouncer() {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		if (SceneContainerFlag.isEnabled) return
		scope.launch("$TAG#listenForAodToPrimaryBouncer") {
		keyguardInteractor.primaryBouncerShowing

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

+10 −32

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ constructor(
		) ->
		if (isWakeAndUnlock(biometricUnlockState.mode)) {
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		// TODO(b/360368320): Adapt for scene framework
		} else {
		startTransitionTo(
		KeyguardState.GONE,
		@@ -138,29 +138,21 @@ constructor(
		val primaryBouncerShowing = keyguardInteractor.primaryBouncerShowing.value

		if (!deviceEntryInteractor.isLockscreenEnabled()) {
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		} else {
		if (!SceneContainerFlag.isEnabled) {
		startTransitionTo(KeyguardState.GONE)
		}
		} else if (canDismissLockscreen()) {
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		} else {
		if (!SceneContainerFlag.isEnabled) {
		startTransitionTo(KeyguardState.GONE)
		}
		} else if (primaryBouncerShowing) {
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		} else {
		if (!SceneContainerFlag.isEnabled) {
		startTransitionTo(KeyguardState.PRIMARY_BOUNCER)
		}
		} else if (isKeyguardOccludedLegacy) {
		startTransitionTo(KeyguardState.OCCLUDED)
		} else if (isIdleOnCommunal && !communalSceneKtfRefactor()) {
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		} else {
		if (!SceneContainerFlag.isEnabled) {
		startTransitionTo(KeyguardState.GLANCEABLE_HUB)
		}
		} else if (
		@@ -171,9 +163,7 @@ constructor(
		) {
		// This case handles tapping the power button to transition through
		// dream -> off -> hub.
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		} else {
		if (!SceneContainerFlag.isEnabled) {
		transitionToGlanceableHub()
		}
		} else {
		@@ -216,30 +206,21 @@ constructor(
		!isWakeAndUnlock(biometricUnlockState.mode)
		) {
		if (canWakeDirectlyToGone) {
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is
		// needed
		} else {
		if (!SceneContainerFlag.isEnabled) {
		startTransitionTo(
		KeyguardState.GONE,
		ownerReason = "waking from dozing"
		)
		}
		} else if (primaryBouncerShowing) {
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is
		// needed
		} else {
		if (!SceneContainerFlag.isEnabled) {
		startTransitionTo(
		KeyguardState.PRIMARY_BOUNCER,
		ownerReason = "waking from dozing"
		)
		}
		} else if (isIdleOnCommunal && !communalSceneKtfRefactor()) {
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is
		// needed
		} else {
		if (!SceneContainerFlag.isEnabled) {
		startTransitionTo(
		KeyguardState.GLANCEABLE_HUB,
		ownerReason = "waking from dozing"
		@@ -253,10 +234,7 @@ constructor(
		) {
		// This case handles tapping the power button to transition through
		// dream -> off -> hub.
		if (SceneContainerFlag.isEnabled) {
		// TODO(b/336576536): Check if adaptation for scene framework is
		// needed
		} else {
		if (!SceneContainerFlag.isEnabled) {
		transitionToGlanceableHub()
		}
		} else {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,6 @@ constructor(
		}

		private fun listenForHubToGone() {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		if (SceneContainerFlag.isEnabled) return
		if (communalSceneKtfRefactor()) {
		scope.launch {

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -276,7 +276,6 @@ constructor(
		}

		private fun listenForLockscreenToGone() {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		if (SceneContainerFlag.isEnabled) return
		if (KeyguardWmStateRefactor.isEnabled) return
		scope.launch("$TAG#listenForLockscreenToGone") {
		@@ -292,7 +291,6 @@ constructor(
		}

		private fun listenForLockscreenToGoneDragging() {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		if (SceneContainerFlag.isEnabled) return
		if (KeyguardWmStateRefactor.isEnabled) {
		// When the refactor is enabled, we no longer use isKeyguardGoingAway.

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,6 @@ constructor(
		}

		private fun listenForOccludedToPrimaryBouncer() {
		// TODO(b/336576536): Check if adaptation for scene framework is needed
		if (SceneContainerFlag.isEnabled) return
		scope.launch {
		keyguardInteractor.primaryBouncerShowing