commit dab85aa7274a1aa37a3384f70780fdaa034b7ae5
author Adam Cohen <adamcohen@google.com> Mon Nov 21 15:14:25 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 21 15:14:25 2011 -0800
tree 8831a726c4fca9c9b69e042af7c036d3a7ee6732
parent b7c9a026359c5d13979b461b1d941c01cc2b2466
parent 026df005fbe448090eebfebeab9a3ada24e4823c

am 026df005: Merge "Fixing bug where drag would sometimes get cancelled inadvertently" into ics-mr1

* commit '026df005fbe448090eebfebeab9a3ada24e4823c':
  Fixing bug where drag would sometimes get cancelled inadvertently

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 88f7954..ea7c0be 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2363,6 +2363,7 @@
             mDragTargetLayout.onDragExit();
         }
         mLastDragOverView = null;
+        mSpringLoadedDragController.cancel();
 
         if (!mIsPageMoving) {
             hideOutlines();