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

Commit e1e0732e authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Allow wallpaper to be visible if wallpaper target exists." into rvc-dev... 

Merge "Allow wallpaper to be visible if wallpaper target exists." into rvc-dev am: 7731d2fc am: c9da3263 am: f80bb306

Change-Id: I016b50251b526d5ee5462fb8e355c6c91d811dca
parents 58244682 f80bb306

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() {