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

Commit f1f6e86b authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "Revert "Use the LockscreenStackBounds during transition LS -> Shade"" into main

parents 7a72a4e9 5c9dad96
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -836,14 +836,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)
    }
}