am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev

* commit '23188c2be4abb23f506b01ccd99884debd09cbb6':
  Restore jankless transition keyguard-to-wallpaper
This commit is contained in:
Craig Mautner
2013-11-15 15:20:18 -08:00
committed by Android Git Automerger

View File

@@ -8525,7 +8525,6 @@ public class WindowManagerService extends IWindowManager.Stub
// We are transitioning from an activity with
// a wallpaper to one without.
transit = AppTransition.TRANSIT_WALLPAPER_CLOSE;
mAnimateWallpaperWithTarget = true;
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
"New transit away from wallpaper: " + transit);
} else if (mWallpaperTarget != null && mWallpaperTarget.isVisibleLw()) {