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

Commit febef305 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Only set FLAG_SHOW_WALLPAPER if we're currently animating unlocked."... 

Merge "Only set FLAG_SHOW_WALLPAPER if we're currently animating unlocked." into tm-dev am: b8953819 am: 6ad797ec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17694670



Change-Id: Ide142523b2ee06aac6c5ec3983ae30141b024740
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0381d2ba 6ad797ec

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java

+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