Merge "Only set FLAG_SHOW_WALLPAPER if we're currently animating unlocked." into tm-dev (b8953819) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -288,7 +288,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
	final boolean keyguardOrAod = state.mKeyguardShowing		final boolean keyguardOrAod = state.mKeyguardShowing
	\|\| (state.mDozing && mDozeParameters.getAlwaysOn());		\|\| (state.mDozing && mDozeParameters.getAlwaysOn());
	if ((keyguardOrAod && !state.mBackdropShowing && !state.mLightRevealScrimOpaque)		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		// 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		// 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		// keyguard and the surface behind the keyguard - we want to use the wallpaper as a