Merge "[Flexiglass] Don't allow NSSL scrolling on the LS" into main (1e28865a) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() {

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

		@Test

+3 −3

Original line number	Diff line number	Diff line
		@@ -331,7 +331,8 @@ constructor(
		combine(sceneInteractor.currentScene, sceneInteractor.currentOverlays) {
		currentScene,
		currentOverlays ->
		currentScene.showsNotifications() \|\| currentOverlays.any { it.showsNotifications() }
		currentScene.showsScrollableStack() \|\|
		currentOverlays.any { it.showsScrollableStack() }
		}
		.dumpWhileCollecting("isScrollable")

		@@ -361,10 +362,9 @@ constructor(
		}
		}

		private fun ContentKey.showsNotifications(): Boolean {
		private fun ContentKey.showsScrollableStack(): Boolean {
		return when (this) {
		Overlays.NotificationsShade,
		Scenes.Lockscreen,
		Scenes.Shade -> true
		else -> false
		}