commit c86756c20196e5c907df01fe0fc9193ffb934082
author Michael Jurka <mikejurka@google.com> Sun Oct 10 15:15:47 2010 -0700
committer Michael Jurka <mikejurka@google.com> Sun Oct 10 15:27:31 2010 -0700
tree 309fa8f34158f0e285a5bfaaf6bd43ae62a4b517
parent 3e7c7634531302271270c8cf418abc959d621cbc

Fixed 3073371: Home screen locked after app launch

Change-Id: Iedac4b94d20cc3352aa247c58978a8f60df1a09f

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index a22a466..ac5c1b9 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -910,8 +910,12 @@
                     cl.setRotationY(rotation);
                 }
             }
-            s.addListener(mUnshrinkAnimationListener);
-            s.start();
+            if (animated) {
+                // If we call this when we're not animated, onAnimationEnd is never called on
+                // the listener; make sure we only use the listener when we're actually animating
+                s.addListener(mUnshrinkAnimationListener);
+                s.start();
+            }
         }
     }