Merge "Remove TODOs for b/336581871" into main (daf9939d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt

+2 −5

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		package com.android.systemui.scene.domain.startable

		import android.app.StatusBarManager
		import com.android.app.tracing.coroutines.launchTraced as launch
		import com.android.compose.animation.scene.ObservableTransitionState
		import com.android.compose.animation.scene.SceneKey
		import com.android.internal.logging.UiEventLogger
		@@ -102,7 +103,6 @@ import kotlinx.coroutines.flow.flowOf
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.flow.mapNotNull
		import kotlinx.coroutines.flow.stateIn
		import com.android.app.tracing.coroutines.launchTraced as launch

		/**
		* Hooks up business logic that manipulates the state of the [SceneInteractor] for the system UI
		@@ -300,7 +300,7 @@ constructor(
		bouncerInteractor.onImeHiddenByUser.collectLatest {
		if (sceneInteractor.currentScene.value == Scenes.Bouncer) {
		sceneInteractor.changeScene(
		toScene = Scenes.Lockscreen, // TODO(b/336581871): add sceneState?
		toScene = Scenes.Lockscreen,
		loggingReason = "IME hidden",
		)
		}
		@@ -318,7 +318,6 @@ constructor(
		when {
		isAnySimLocked -> {
		switchToScene(
		// TODO(b/336581871): add sceneState?
		targetSceneKey = Scenes.Bouncer,
		loggingReason = "Need to authenticate locked SIM card.",
		)
		@@ -326,7 +325,6 @@ constructor(
		unlockStatus.isUnlocked &&
		deviceEntryInteractor.canSwipeToEnter.value == false -> {
		switchToScene(
		// TODO(b/336581871): add sceneState?
		targetSceneKey = Scenes.Gone,
		loggingReason =
		"All SIM cards unlocked and device already unlocked and " +
		@@ -335,7 +333,6 @@ constructor(
		}
		else -> {
		switchToScene(
		// TODO(b/336581871): add sceneState?
		targetSceneKey = Scenes.Lockscreen,
		loggingReason =
		"All SIM cards unlocked and device still locked" +

packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.shade

		import android.view.MotionEvent
		import com.android.app.tracing.coroutines.launchTraced as launch
		import com.android.systemui.assist.AssistManager
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Background
		@@ -39,7 +40,6 @@ import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.delay
		import kotlinx.coroutines.flow.first
		import com.android.app.tracing.coroutines.launchTraced as launch
		import kotlinx.coroutines.withContext

		/**
		@@ -136,7 +136,6 @@ constructor(
		}

		private fun animateCollapseShadeInternal() {
		// TODO(b/336581871): add sceneState?
		shadeInteractor.collapseEitherShade(
		loggingReason = "ShadeController.animateCollapseShade",
		transitionKey = SlightlyFasterShadeCollapse,

packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeBackActionInteractorImpl.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ constructor(
		} else {
		Scenes.Shade
		}
		// TODO(b/336581871): add sceneState?
		sceneInteractor.changeScene(key, "animateCollapseQs")
		}
		}