Merge "[Flexiglass] make NSSL expanded in the QS" into main (6af0bcd2) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt

+16 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,22 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() {
		assertThat(isScrollable).isTrue()
		}

		@Test
		fun shadeExpansion_idleOnQs() =
		testScope.runTest {
		val transitionState =
		MutableStateFlow<ObservableTransitionState>(
		ObservableTransitionState.Idle(currentScene = Scenes.QuickSettings)
		)
		sceneInteractor.setTransitionState(transitionState)
		val expandFraction by collectLastValue(scrollViewModel.expandFraction)
		assertThat(expandFraction).isEqualTo(1f)

		fakeSceneDataSource.changeScene(toScene = Scenes.QuickSettings)
		val isScrollable by collectLastValue(scrollViewModel.isScrollable)
		assertThat(isScrollable).isFalse()
		}

		@Test
		fun shadeExpansion_shadeToQs() =
		testScope.runTest {

+11 −7

Original line number	Diff line number	Diff line
		@@ -70,10 +70,10 @@ constructor(
		) { shadeExpansion, shadeMode, qsExpansion, transitionState, quickSettingsScene ->
		when (transitionState) {
		is ObservableTransitionState.Idle -> {
		if (transitionState.currentScene == Scenes.Lockscreen) {
		1f
		} else {
		shadeExpansion
		when (transitionState.currentScene) {
		Scenes.Lockscreen,
		Scenes.QuickSettings -> 1f
		else -> shadeExpansion
		}
		}
		is ObservableTransitionState.Transition -> {
		@@ -162,9 +162,13 @@ constructor(
		stackAppearanceInteractor::setCurrentGestureOverscroll

		/** Whether the notification stack is scrollable or not. */
		val isScrollable: Flow<Boolean> = sceneInteractor.currentScene.map {
		sceneInteractor.isSceneInFamily(it, SceneFamilies.NotifShade) \|\| it == Scenes.Lockscreen
		}.dumpWhileCollecting("isScrollable")
		val isScrollable: Flow<Boolean> =
		sceneInteractor.currentScene
		.map {
		sceneInteractor.isSceneInFamily(it, SceneFamilies.NotifShade) \|\|
		it == Scenes.Lockscreen
		}
		.dumpWhileCollecting("isScrollable")

		/** Whether the notification stack is displayed in doze mode. */
		val isDozing: Flow<Boolean> by lazy {