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

Commit 7269c57c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the wallpaper not hiding immediately" into main am: 55b1b0db am: 729d0609 

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



Change-Id: I5031f615a46d9b53ecc4bf4ba52fe3b88798361e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10e722ae 729d0609

services/core/java/com/android/server/wm/Transition.java

+10 −1
Original line number Diff line number Diff line
@@ -1429,7 +1429,16 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        // Commit wallpaper visibility after activity, because usually the wallpaper target token is

        // an activity, and wallpaper's visibility depends on activity's visibility.

        for (int i = mParticipants.size() - 1; i >= 0; --i) {

            final WallpaperWindowToken wt = mParticipants.valueAt(i).asWallpaperToken();

            final WindowContainer<?> wc = mParticipants.valueAt(i);

            WallpaperWindowToken wt = wc.asWallpaperToken();

            if (!Flags.ensureWallpaperInTransitions()) {

                if (wt == null) {

                    final WindowState windowState = wc.asWindowState();

                    if (windowState != null) {

                        wt = windowState.mToken.asWallpaperToken();

                    }

                }

            }

            if (wt == null) continue;

            final WindowState target = wt.mDisplayContent.mWallpaperController.getWallpaperTarget();

            final boolean isTargetInvisible = target == null || !target.mToken.isVisible();