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

Commit b040a224 authored by wilsonshih's avatar wilsonshih
Browse files

Allow wallpaper to be visible if wallpaper target exists. 

When entering PIP task, the obscured condition will be changed after the
fullscreen task reparent to PIP task, and since the PIP animation is
moved out, the opening animation of enter NexusLauncher will not synced
with SystemUI, so wallpaper could become invisible during we moving a
fullscreen task to PIP task.
So a simple fix idea is that if the wallpaper target is visible, then
wallpaper should also be visible.
And review the findWallpaperTarget method, we find the check conditions
have been duplicated with isWallpaperVisible, so we can simplify the method
isWallpaperVisible by checking whether the wallpaper target exists.

Fixes: 156014070
Test: atest WallpaperControllerTests
Change-Id: Ib02f1e6ce10d4c412d049aa84541f5a5323fd455
parent 016ea8a0

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

+6 −17
Original line number Diff line number Diff line
@@ -238,23 +238,12 @@ class WallpaperController { 
        }

    }



    private final boolean isWallpaperVisible(WindowState wallpaperTarget) {

        final RecentsAnimationController recentsAnimationController =

                mService.getRecentsAnimationController();

        boolean isAnimatingWithRecentsComponent = recentsAnimationController != null

                && recentsAnimationController.isWallpaperVisible(wallpaperTarget);

        if (DEBUG_WALLPAPER) Slog.v(TAG, "Wallpaper vis: target " + wallpaperTarget + ", obscured="

                + (wallpaperTarget != null ? Boolean.toString(wallpaperTarget.mObscured) : "??")

                + " animating=" + ((wallpaperTarget != null && wallpaperTarget.mActivityRecord != null)

                ? wallpaperTarget.mActivityRecord.isAnimating(TRANSITION | PARENTS) : null)

                + " prev=" + mPrevWallpaperTarget

                + " recentsAnimationWallpaperVisible=" + isAnimatingWithRecentsComponent);

        return (wallpaperTarget != null

                && (!wallpaperTarget.mObscured

                        || isAnimatingWithRecentsComponent

                        || (wallpaperTarget.mActivityRecord != null

                        && wallpaperTarget.mActivityRecord.isAnimating(TRANSITION | PARENTS))))

                || mPrevWallpaperTarget != null;

    private boolean isWallpaperVisible(WindowState wallpaperTarget) {

        if (DEBUG_WALLPAPER) {

            Slog.v(TAG, "Wallpaper vis: target " + wallpaperTarget + " prev="

                    + mPrevWallpaperTarget);

        }

        return wallpaperTarget != null || mPrevWallpaperTarget != null;

    }



    boolean isWallpaperTargetAnimating() {