From 3aa7fcac1c46353c2f147d978d9eb2f2748def4a Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Sat, 2 Jun 2012 15:31:33 -0700 Subject: Revert change to correct animations. Incorrect animation was introduced with CL 196207 (perhaps in combination with a later CL). Reverting part of that CL fixes the incorrect animation and so far has not reintroduced the jank that was fixed by that CL. If the jank reappears it should be fixed in a different fashion than in CL 196207. Fixes bug 6597505. Change-Id: Ie8012237a8d49810ede51bd8d78ef8c2fd91ddd4 --- services/java/com/android/server/wm/WindowManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services') diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 10919f2..1e9da9e 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -8078,7 +8078,7 @@ public class WindowManagerService extends IWindowManager.Stub } if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "New transit: " + transit); - } else if ((oldWallpaper != null) && (oldWallpaper != mWallpaperTarget)) { + } else if (oldWallpaper != null) { // We are transitioning from an activity with // a wallpaper to one without. transit = WindowManagerPolicy.TRANSIT_WALLPAPER_CLOSE; -- cgit v1.1