Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ff109a authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Restore HUN appear animations in shade" into main

parents 4a7c754a 59cbfad0

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

+2 −2
Original line number Diff line number Diff line
@@ -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()

        }

}

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

+1 −7
Original line number Diff line number Diff line
@@ -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")

        }

    }