Merge "Only set FLAG_SHOW_WALLPAPER if we're currently animating unlocked."
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user