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

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

Browse Source 
* commit '1d48ca51de63c43f57ece57aed43a4aa7ce31756':
  Set detached wallpaper on the scale up animation.
This commit is contained in:
Craig Mautner
2012-06-12 19:10:52 -07:00
committed by Android Git Automerger
parent 554259fe02 1d48ca51de
commit 9132c25d22
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;
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);