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

Commit 863289d2 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Fix wallpaper crop during unlock animation" into nyc-dev 

am: d4a45e0c

* commit 'd4a45e0c':
  Fix wallpaper crop during unlock animation

Change-Id: I06518707f4a1d4661f0e039f3a9f4778ae3f4a1b
parents 6d8d2a03 d4a45e0c

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

+12 −2
Original line number Diff line number Diff line
@@ -1334,7 +1334,17 @@ class WindowStateAnimator { 
            final WindowState wallpaperTarget = mWallpaperControllerLocked.getWallpaperTarget();

            if (wallpaperTarget != null) {

                final Task task = wallpaperTarget.getTask();

                if (task != null && !task.isFullscreen()) {

                final WindowStateAnimator winAnimator = wallpaperTarget.mWinAnimator;

                // We can only crop the wallpaper using final crop with stack bounds if the target

                // is not animating, or if it's animating with clip mode STACK_CLIP_AFTER_ANIM.

                // If it's animating with mode STACK_CLIP_NONE, we shouldn't crop either the task

                // itself or the wallpaper. If it's animating with STACK_CLIP_BEFORE_ANIM, the crop

                // is before the transform on the task itself.

                final boolean useFinalCropOnWallpaper = !winAnimator.isAnimationSet()

                        || winAnimator.resolveStackClip() == STACK_CLIP_AFTER_ANIM;

                if (task != null && !task.isFullscreen()

                        && task.cropWindowsToStackBounds()

                        && useFinalCropOnWallpaper){

                    final TaskStack stack = task.mStack;

                    if (stack != null && !stack.isFullscreen()) {

                        stack.getDimBounds(mTmpStackBounds);