Merge "Keep showing wallpaper when starting an app immediatly after unlock." into sc-v2-dev

This commit is contained in:
Issei Suzuki
2022-02-23 16:03:22 +00:00
committed by Android (Google) Code Review

View File

@@ -202,8 +202,11 @@ class WallpaperController {
"Win " + w + ": token animating, looking behind."); "Win " + w + ": token animating, looking behind.");
} }
mFindResults.setIsWallpaperTargetForLetterbox(w.hasWallpaperForLetterboxBackground()); mFindResults.setIsWallpaperTargetForLetterbox(w.hasWallpaperForLetterboxBackground());
// Found a target! End search. // While the keyguard is going away, both notification shade and a normal activity such
return true; // 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;
} }
return false; return false;
}; };