commit b0736fac73b0df95f18234a0494aea3f3fc6c735
author Adam Cohen <adamcohen@google.com> Thu Nov 17 10:28:02 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 17 10:28:02 2011 -0800
tree 7543cb927ad35233c20eada53b842f75e5312497
parent 6d09268cdef87be5686e541ba25148c7d72e0d59
parent 70ed13b370e390010ee57eed5983fb86da061ed9

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

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);