Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only set FLAG_SHOW_WALLPAPER if we're currently animating unlocked." into tm-dev

Browse Source
This commit is contained in:
Josh Tsuji
2022-04-14 21:28:13 +00:00
committed by Android (Google) Code Review
parent 6ad21dae20 715e3df658
commit b8953819a3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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