diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-11-17 10:28:02 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 10:28:02 -0800 |
| commit | b0736fac73b0df95f18234a0494aea3f3fc6c735 (patch) | |
| tree | 7543cb927ad35233c20eada53b842f75e5312497 /src/com/android | |
| parent | 6d09268cdef87be5686e541ba25148c7d72e0d59 (diff) | |
| parent | 70ed13b370e390010ee57eed5983fb86da061ed9 (diff) | |
| download | android_packages_apps_Trebuchet-b0736fac73b0df95f18234a0494aea3f3fc6c735.tar.gz android_packages_apps_Trebuchet-b0736fac73b0df95f18234a0494aea3f3fc6c735.tar.bz2 android_packages_apps_Trebuchet-b0736fac73b0df95f18234a0494aea3f3fc6c735.zip | |
Merge "Fix hiccup when dropping in springloaded mode on large ui" into ics-mr1
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 8c5734970..0598cd968 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1138,6 +1138,7 @@ public class Workspace extends SmoothPagedView } private void screenScrolledLargeUI(int screenCenter) { + if (isSwitchingState()) return; boolean isInOverscroll = false; for (int i = 0; i < getChildCount(); i++) { CellLayout cl = (CellLayout) getChildAt(i); |