Merge "Set detached wallpaper on the scale up animation." into jb-dev

Author: Craig Mautner

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

@@ -1740,8 +1740,6 @@ int adjustWallpaperWindowsLocked() {
                             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 @@ private Animation createScaleUpAnimationLocked(int transit, boolean enter) {
             set.addAnimation(scale);
             alpha.setDuration(duration);
             set.addAnimation(alpha);
+            set.setDetachWallpaper(true);
             a = set;
         } else {
             a = createExitAnimationLocked(transit, duration);