Merge "Don't expand notifications when bouncer visible" into main (4565a43c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt

+8 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,13 @@ constructor(
		shadeInteractor: ShadeInteractor,
		) {
		private val statesForConstrainedNotifications =
		setOf(KeyguardState.LOCKSCREEN, KeyguardState.AOD, KeyguardState.DOZING)
		setOf(
		KeyguardState.LOCKSCREEN,
		KeyguardState.AOD,
		KeyguardState.DOZING,
		KeyguardState.ALTERNATE_BOUNCER,
		KeyguardState.PRIMARY_BOUNCER
		)

		val configurationBasedDimensions: Flow<ConfigurationBasedDimensions> =
		interactor.configurationBasedDimensions
		@@ -126,6 +132,7 @@ constructor(
		/**
		* When on keyguard, there is limited space to display notifications so calculate how many could
		* be shown. Otherwise, there is no limit since the vertical space will be scrollable.
		*
		* TODO: b/296606746 - Need to rerun logic when notifs change
		*/
		val maxNotifications: Flow<Int> =

+8 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,14 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() {
		)
		)
		assertThat(isOnLockscreen).isTrue()

		keyguardTransitionRepository.sendTransitionStep(
		TransitionStep(
		to = KeyguardState.PRIMARY_BOUNCER,
		transitionState = TransitionState.FINISHED
		)
		)
		assertThat(isOnLockscreen).isTrue()
		}

		@Test