Limit findWallpaperTarget's NotificationShade case
- There is a special case added for ignoring the notification shade
while the keyguard is going away. This was actually always ignoring
the notification shade if there's another (activity) window on
screen which is problematic if that activity is going away and leaving
just the notification shade on screen.
+ Check for keyguardGoingAway before going into this special case.
This stops some flickers during the activity/keyguard unocclude
animation.
Test: atest CtsWallpaperTestCases
Bug: 315698413
Bug: 312649396
Change-Id: I7187e2c392a8d64a1260fc9b5c00225ea79edca7
diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java
index 33ef3c5..a9f0554 100644
--- a/services/core/java/com/android/server/wm/WallpaperController.java
+++ b/services/core/java/com/android/server/wm/WallpaperController.java
@@ -183,18 +183,21 @@
&& (mWallpaperTarget == w || w.isDrawFinishedLw())) {
if (DEBUG_WALLPAPER) Slog.v(TAG, "Found wallpaper target: " + w);
mFindResults.setWallpaperTarget(w);
+ mFindResults.setIsWallpaperTargetForLetterbox(w.hasWallpaperForLetterboxBackground());
if (w == mWallpaperTarget && w.isAnimating(TRANSITION | PARENTS)) {
// The current wallpaper target is animating, so we'll look behind it for
// another possible target and figure out what is going on later.
if (DEBUG_WALLPAPER) Slog.v(TAG,
"Win " + w + ": token animating, looking behind.");
}
- mFindResults.setIsWallpaperTargetForLetterbox(w.hasWallpaperForLetterboxBackground());
// While the keyguard is going away, both notification shade and a normal activity such
// as a launcher can satisfy criteria for a wallpaper target. In this case, we should
// chose the normal activity, otherwise wallpaper becomes invisible when a new animation
// starts before the keyguard going away animation finishes.
- return w.mActivityRecord != null;
+ if (w.mActivityRecord == null && mDisplayContent.isKeyguardGoingAway()) {
+ return false;
+ }
+ return true;
}
return false;
};