Merge "[flexiglass] Don't switch to Shade when collapsing shades" into main (22847604) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ShadeControllerSceneImplTest.kt

+16 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor
		import com.android.systemui.scene.shared.model.Overlays
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.shade.domain.interactor.ShadeInteractor
		import com.android.systemui.shade.domain.interactor.disableDualShade
		import com.android.systemui.shade.domain.interactor.enableDualShade
		import com.android.systemui.shade.domain.interactor.shadeInteractor
		import com.android.systemui.statusbar.CommandQueue
		@@ -214,6 +215,21 @@ class ShadeControllerSceneImplTest : SysuiTestCase() {
		assertThat(currentOverlays).isEmpty()
		}

		@Test
		fun instantCollapseShade_singleShade_doesntSwitchToShadeScene() =
		testScope.runTest {
		kosmos.disableDualShade()
		runCurrent()
		val currentScene by collectLastValue(sceneInteractor.currentScene)
		val homeScene = currentScene
		sceneInteractor.changeScene(Scenes.QuickSettings, "")
		assertThat(currentScene).isEqualTo(Scenes.QuickSettings)

		underTest.instantCollapseShade()

		assertThat(currentScene).isEqualTo(homeScene)
		}

		private fun setScene(key: SceneKey) {
		sceneInteractor.changeScene(key, "test")
		sceneInteractor.setTransitionState(

+1 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@ constructor(
		shadeInteractor.collapseQuickSettingsShade(
		loggingReason = "ShadeControllerSceneImpl.instantCollapseShade",
		transitionKey = Instant,
		bypassNotificationsShade = true,
		)
		}