diff options
2 files changed, 16 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt index 6f4adebba82d..f750feda9091 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt @@ -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> = diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt index 75fb22dfddd0..ff68eb7f7aa1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelTest.kt @@ -220,6 +220,14 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() { ) ) assertThat(isOnLockscreen).isTrue() + + keyguardTransitionRepository.sendTransitionStep( + TransitionStep( + to = KeyguardState.PRIMARY_BOUNCER, + transitionState = TransitionState.FINISHED + ) + ) + assertThat(isOnLockscreen).isTrue() } @Test |