commit 9753d13c7bda09c1203c611ac6717021037f39c3
author Michael Jurka <mikejurka@google.com> Tue Feb 14 12:13:34 2012 -0800
committer Winson Chung <winsonc@google.com> Tue Feb 14 13:36:59 2012 -0800
tree 1a948661436dab156c55110c4e781f8e0c626ba3
parent d83f5f4db328fbd152491bbf9fa13abc94bd6f25

Revert "Speed up All Apps -> Workspace transition"

Temp fix for 5976264

This reverts commit 9433fa7ebad74320e39bfac6161a68bc850fe161.

Change-Id: Ic49ffc818b9b233b3717b52a5f77eaac1e001f5b

src/com/android/launcher2/AppsCustomizeTabHost.java

diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index caababa..023946b 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher2/AppsCustomizeTabHost.java
@@ -347,8 +347,9 @@
 
     /* LauncherTransitionable overrides */
     @Override
-    public void onLauncherTransitionStart(Launcher l, boolean animated, boolean toWorkspace) {
+    public void onLauncherTransitionStart(Launcher l, Animator animation, boolean toWorkspace) {
         mInTransition = true;
+        boolean animated = (animation != null);
 
         mContent.setVisibility(VISIBLE);
 
@@ -371,9 +372,9 @@
     }
 
     @Override
-    public void onLauncherTransitionEnd(Launcher l, boolean animated, boolean toWorkspace) {
+    public void onLauncherTransitionEnd(Launcher l, Animator animation, boolean toWorkspace) {
         mInTransition = false;
-        if (animated) {
+        if (animation != null) {
             setLayerType(LAYER_TYPE_NONE, null);
         }