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

Commit 5c9dad96 authored by András Kurucz's avatar András Kurucz
Browse files

Revert "Use the LockscreenStackBounds during transition LS -> Shade" 

This reverts commit 4d68819b.

Reason for revert: b/440593533

Fixes: 440593533

Change-Id: Ic63a9df7186971b96b1f3feec362967feaef54ee
parent 3df32c4e

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+3 −5
Original line number Diff line number Diff line
@@ -829,14 +829,12 @@ private suspend fun scrollNotificationStack( 
private fun TransitionState.isOnLockscreen(): Boolean {

    return currentScene == Scenes.Lockscreen && currentOverlays.isEmpty()

}



private fun shouldUseLockscreenStackBounds(state: TransitionState): Boolean {

    return when (state) {

        is TransitionState.Idle -> state.isOnLockscreen()

        is TransitionState.Transition ->

            // Keep using the lockscreen stack bounds when transitioning from lockscreen

            // to other states for visual consistency, eg. the smart space should be visible.

            state.isTransitioning(from = Scenes.Lockscreen)

            // Keep using the lockscreen stack bounds when there is no placeholder on the next content

            state.fromContent == Scenes.Lockscreen && state.toContent != Scenes.Shade

                || state.isTransitioningBetween(content = Scenes.Lockscreen, other = Overlays.Bouncer)

    }

}