am 6d1c4ff2: am c7d12b9d: am b0736fac: Merge "Fix hiccup when dropping in springloaded mode on large ui" into ics-mr1
* commit '6d1c4ff2f3736e7f6da2a1c43e8c45af4b1a4900':
Fix hiccup when dropping in springloaded mode on large ui
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);