am ed51f0ac: am e17e0f0e: Merge "Fix jank for translucent window transitions" into klp-dev

* commit 'ed51f0ac8f264c83bbafa397f8ee9a83ab9ab033':
  Fix jank for translucent window transitions
This commit is contained in:
Adam Lesinski
2013-10-21 17:20:15 -07:00
committed by Android Git Automerger

View File

@@ -8407,6 +8407,20 @@ public class WindowManagerService extends IWindowManager.Stub
&& !mWallpaperTarget.mWinAnimator.isDummyAnimation()
? null : mWallpaperTarget;
// If there is a wallpaper target and the target is neither opening nor closing, then
// there exists an app on top of the wallpaper target that has a translucent
// background.
// If the pending transition is an exit, we should add the wallpaper target to the list
// of opening apps so that the translucent app on top of it will animate correctly.
final AppWindowToken wallpaperTargetAppToken =
mWallpaperTarget != null ? mWallpaperTarget.mAppToken : null;
if (wallpaperTargetAppToken != null
&& !mClosingApps.contains(wallpaperTargetAppToken)
&& !mOpeningApps.contains(wallpaperTargetAppToken)
&& (transit & AppTransition.TRANSIT_EXIT_MASK) != 0) {
mOpeningApps.add(wallpaperTargetAppToken);
NN++;
}
mInnerFields.mWallpaperMayChange = false;
// The top-most window will supply the layout params,