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

Commit ffd7206b authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Only set FLAG_SHOW_WALLPAPER if we're currently animating unlocked.

Fixes: 226673097
Test: swipe to unlock, fast-swipe to unlock, UDFPS unlock, bouncer unlock, note wallpaper is visible when it should be
Change-Id: I609d78e981376f44f36bb033527161c631b04f2f
parent 944ca685
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
        final boolean keyguardOrAod = state.mKeyguardShowing
                || (state.mDozing && mDozeParameters.getAlwaysOn());
        if ((keyguardOrAod && !state.mBackdropShowing && !state.mLightRevealScrimOpaque)
                || mKeyguardViewMediator.isAnimatingBetweenKeyguardAndSurfaceBehindOrWillBe()) {
                || mKeyguardViewMediator.isAnimatingBetweenKeyguardAndSurfaceBehind()) {
            // Show the wallpaper if we're on keyguard/AOD and the wallpaper is not occluded by a
            // solid backdrop. Also, show it if we are currently animating between the
            // keyguard and the surface behind the keyguard - we want to use the wallpaper as a