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

Commit 7c6aa0e4 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 am: e1e0732e

Change-Id: I573326a7495a300b7d7d8678c2e423d56963b508
parents 1e55cbf3 e1e0732e

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