commit 6d1c4ff2f3736e7f6da2a1c43e8c45af4b1a4900
author Adam Cohen <adamcohen@google.com> Thu Nov 17 13:20:31 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 17 13:20:31 2011 -0800
tree bc226757f3add826c67a9f47b1c8238efa294892
parent f0aa1936876519df04e213ced4929e2632222fcf
parent c7d12b9de8af94a70f2fe22179f388ed14f826d0

am c7d12b9d: am b0736fac: Merge "Fix hiccup when dropping in springloaded mode on large ui" into ics-mr1

* commit 'c7d12b9de8af94a70f2fe22179f388ed14f826d0':
  Fix hiccup when dropping in springloaded mode on large ui

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 8c57349..0598cd9 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1138,6 +1138,7 @@
     }
 
     private void screenScrolledLargeUI(int screenCenter) {
+        if (isSwitchingState()) return;
         boolean isInOverscroll = false;
         for (int i = 0; i < getChildCount(); i++) {
             CellLayout cl = (CellLayout) getChildAt(i);