diff options
2 files changed, 3 insertions, 9 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt index ba7ddce10958..f8e633731c42 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt @@ -633,7 +633,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas @Test @EnableFlags(NotificationsHeadsUpRefactor.FLAG_NAME) - fun headsUpAnimationsEnabled_keyguardShowing_false() = + fun headsUpAnimationsEnabled_keyguardShowing_true() = testScope.runTest { val animationsEnabled by collectLastValue(underTest.headsUpAnimationsEnabled) @@ -641,6 +641,6 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas fakeKeyguardRepository.setStatusBarState(StatusBarState.KEYGUARD) runCurrent() - assertThat(animationsEnabled).isFalse() + assertThat(animationsEnabled).isTrue() } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt index b54f9c4c6d32..5fba615e020b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt @@ -275,13 +275,7 @@ constructor( if (NotificationsHeadsUpRefactor.isUnexpectedlyInLegacyMode()) { flowOf(false) } else { - combine( - notificationStackInteractor.isShowingOnLockscreen, - shadeInteractor.isShadeFullyCollapsed - ) { (isKeyguardShowing, isShadeFullyCollapsed) -> - !isKeyguardShowing && isShadeFullyCollapsed - } - .dumpWhileCollecting("headsUpAnimationsEnabled") + flowOf(true).dumpWhileCollecting("headsUpAnimationsEnabled") } } |