diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-15 23:13:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-15 23:13:48 +0000 |
| commit | 23188c2be4abb23f506b01ccd99884debd09cbb6 (patch) | |
| tree | 17f8e8b540775f4882bdb5865d77f4ccb15b674c | |
| parent | 31cab2f803951edb13ea07e7e34916189fec5167 (diff) | |
| parent | de43ebe86a26aabee51409472a59ec0c080c2052 (diff) | |
| download | base-23188c2be4abb23f506b01ccd99884debd09cbb6.tar.gz | |
Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 1395eda9294a..060e09c9fb2d 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -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()) { |