Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef17fbb2 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Keep showing wallpaper when starting an app immediatly after unlock. 2p: f0a9429c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16978905

Bug: 215685199
Change-Id: I04f28289f660042f90ca515c403916828ebedd2e
parents 5300854f f0a9429c
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -202,8 +202,11 @@ class WallpaperController {
                        "Win " + w + ": token animating, looking behind.");
            }
            mFindResults.setIsWallpaperTargetForLetterbox(w.hasWallpaperForLetterboxBackground());
            // Found a target! End search.
            return true;
            // 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;
        }
        return false;
    };