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

Commit 6cc4c9d6 authored by Matt Pietal's avatar Matt Pietal
Browse files

Don't expand notifications when bouncer visible 

The max notifications shouldn't be set to -1 when the bouncer is
showing to prevent overlap with the lock icon

Fixes: 299285987
Test: atest SharedNotificationContainerViewModelTest
Change-Id: I87a0c42ed76b16c8f781fa962b09e84064ee5c13
parent b90e7f68

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,13 @@ constructor( 
    shadeInteractor: ShadeInteractor,

    shadeInteractor: ShadeInteractor,

) {

) {

    private val statesForConstrainedNotifications =

    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> =

    val configurationBasedDimensions: Flow<ConfigurationBasedDimensions> =

        interactor.configurationBasedDimensions

        interactor.configurationBasedDimensions
@@ -126,6 +132,7 @@ constructor( 
    /**

    /**

     * When on keyguard, there is limited space to display notifications so calculate how many could

     * 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.

     * be shown. Otherwise, there is no limit since the vertical space will be scrollable.

     *

     * TODO: b/296606746 - Need to rerun logic when notifs change

     * TODO: b/296606746 - Need to rerun logic when notifs change

     */

     */

    val maxNotifications: Flow<Int> =

    val maxNotifications: Flow<Int> =

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -220,6 +220,14 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() { 
                )

                )

            )

            )

            assertThat(isOnLockscreen).isTrue()

            assertThat(isOnLockscreen).isTrue()



            keyguardTransitionRepository.sendTransitionStep(

                TransitionStep(

                    to = KeyguardState.PRIMARY_BOUNCER,

                    transitionState = TransitionState.FINISHED

                )

            )

            assertThat(isOnLockscreen).isTrue()

        }

        }





    @Test

    @Test