commit 21291a712821dc8d173e56d4358e68e7ce4938ea
author Adam Cohen <adamcohen@google.com> Mon Nov 21 21:07:45 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 21 21:07:45 2011 -0800
tree 139f6b2ee2cf710992da386c3eccd8c1de8f4a03
parent 84a1476e00c3abb99f0b8efb671c8bdef985386a
parent dab85aa7274a1aa37a3384f70780fdaa034b7ae5

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

* commit 'dab85aa7274a1aa37a3384f70780fdaa034b7ae5':
  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();