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

Commit 9cb59d20 authored by András Kurucz's avatar András Kurucz
Browse files

Udate sources for determining NSSL.headsUpAnimationsEnabled 

Rely on the StatusBarState, and the isShadeFullyCollapsed signal to
match previous behavior before the refactor.

Bug: 325936094
Test: observe HUN intro/outro animations
Flag: ACONFIG com.android.systemui.notifications_heads_up_refactor
STAGING

Change-Id: Ie7a86a3d37a4c985ea7dbfe82e80210b3cd5a1ac
parent c7daf268

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

+2 −2
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
            val animationsEnabled by collectLastValue(underTest.headsUpAnimationsEnabled)



            shadeTestUtil.setQsExpansion(0.0f)

            fakeKeyguardRepository.setKeyguardShowing(false)

            fakeKeyguardRepository.setStatusBarState(StatusBarState.SHADE)

            runCurrent()



            assertThat(animationsEnabled).isTrue()
@@ -620,7 +620,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
            val animationsEnabled by collectLastValue(underTest.headsUpAnimationsEnabled)



            shadeTestUtil.setQsExpansion(0.0f)

            fakeKeyguardRepository.setKeyguardShowing(true)

            fakeKeyguardRepository.setStatusBarState(StatusBarState.KEYGUARD)

            runCurrent()



            assertThat(animationsEnabled).isFalse()

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

+6 −7
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.notification.stack.ui.viewmodel 


import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dump.DumpManager

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.domain.interactor.RemoteInputInteractor

import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor
@@ -59,7 +58,6 @@ constructor( 
    activeNotificationsInteractor: ActiveNotificationsInteractor,

    notificationStackInteractor: NotificationStackInteractor,

    private val headsUpNotificationInteractor: HeadsUpNotificationInteractor,

    keyguardInteractor: KeyguardInteractor,

    remoteInputInteractor: RemoteInputInteractor,

    seenNotificationsInteractor: SeenNotificationsInteractor,

    shadeInteractor: ShadeInteractor,
@@ -277,10 +275,11 @@ constructor( 
        if (NotificationsHeadsUpRefactor.isUnexpectedlyInLegacyMode()) {

            flowOf(false)

        } else {

            combine(keyguardInteractor.isKeyguardShowing, shadeInteractor.isShadeFullyExpanded) {

                    (isKeyguardShowing, isShadeFullyExpanded) ->

                    // TODO(b/325936094) use isShadeFullyCollapsed instead

                    !isKeyguardShowing && !isShadeFullyExpanded

            combine(

                notificationStackInteractor.isShowingOnLockscreen,

                shadeInteractor.isShadeFullyCollapsed

            ) { (isKeyguardShowing, isShadeFullyCollapsed) ->

                !isKeyguardShowing && isShadeFullyCollapsed

            }

                .dumpWhileCollecting("headsUpAnimationsEnabled")

        }

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelKosmos.kt

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.notification.stack.ui.viewmodel



import com.android.systemui.dump.dumpManager

import com.android.systemui.keyguard.domain.interactor.keyguardInteractor

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture

import com.android.systemui.kosmos.testDispatcher
@@ -42,7 +41,6 @@ val Kosmos.notificationListViewModel by Fixture { 
        activeNotificationsInteractor,

        notificationStackInteractor,

        headsUpNotificationInteractor,

        keyguardInteractor,

        remoteInputInteractor,

        seenNotificationsInteractor,

        shadeInteractor,