From c86756c20196e5c907df01fe0fc9193ffb934082 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Sun, 10 Oct 2010 15:15:47 -0700
Subject: [PATCH] Fixed 3073371: Home screen locked after app launch

Change-Id: Iedac4b94d20cc3352aa247c58978a8f60df1a09f
---
 src/com/android/launcher2/Workspace.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index a22a466a75..ac5c1b9d26 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -910,8 +910,12 @@ public class Workspace extends SmoothPagedView
                     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();
+            }
         }
     }