summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-11-15 14:15:43 -0800
committerCraig Mautner <cmautner@google.com>2013-11-15 14:15:43 -0800
commitde43ebe86a26aabee51409472a59ec0c080c2052 (patch)
tree0919e5585aadcf2c66bbe4aadba673c7294d8fb7
parent3de885bef2f0f85ea76fd96c8f18cdd743ce66a4 (diff)
downloadbase-de43ebe86a26aabee51409472a59ec0c080c2052.tar.gz
Restore jankless transition keyguard-to-wallpaper
There is still a flash of black when going to a non-wallpaper activity from keyguard. This is not a regression from jb-mr2 and any fixes to clean it up are too risky at this late date. Fixes (partially) bug 11570753. Change-Id: I17aaae4ab8be570f7e28276a7b8ac4b8685e7551
-rw-r--r--services/java/com/android/server/wm/WindowManagerService.java1
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()) {