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

Commit 1d48ca51 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 1c958102: Merge "Set detached wallpaper on the scale up animation." into jb-dev 

* commit '1c958102':
  Set detached wallpaper on the scale up animation.
parents 9eabf916 1c958102

services/java/com/android/server/wm/WindowManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -1740,8 +1740,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                            mWallpaperTarget = oldW;

                            foundW = oldW;

                            foundI = oldI;

                            mLowerWallpaperTarget = null;

                            mUpperWallpaperTarget = null;

                        } 

                        // Now set the upper and lower wallpaper targets

                        // correctly, and make sure that we are positioning
@@ -3162,6 +3160,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            set.addAnimation(scale);

            alpha.setDuration(duration);

            set.addAnimation(alpha);

            set.setDetachWallpaper(true);

            a = set;

        } else {

            a = createExitAnimationLocked(transit, duration);