Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1c9581023ced89a209fca9c4e40305f8e0859732':
  Set detached wallpaper on the scale up animation.
This commit is contained in:
Craig Mautner
2012-06-12 19:06:46 -07:00
committed by Android Git Automerger
parent 9eabf916dc 1c9581023c
commit 1d48ca51de
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -1740,8 +1740,6 @@ public class WindowManagerService extends IWindowManager.Stub
mWallpaperTarget = oldW; mWallpaperTarget = oldW;
foundW = oldW; foundW = oldW;
foundI = oldI; foundI = oldI;
mLowerWallpaperTarget = null;
mUpperWallpaperTarget = null;
} }
// Now set the upper and lower wallpaper targets // Now set the upper and lower wallpaper targets
// correctly, and make sure that we are positioning // correctly, and make sure that we are positioning
@@ -3162,6 +3160,7 @@ public class WindowManagerService extends IWindowManager.Stub
set.addAnimation(scale); set.addAnimation(scale);
alpha.setDuration(duration); alpha.setDuration(duration);
set.addAnimation(alpha); set.addAnimation(alpha);
set.setDetachWallpaper(true);
a = set; a = set;
} else { } else {
a = createExitAnimationLocked(transit, duration); a = createExitAnimationLocked(transit, duration);