diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-11-21 15:11:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-21 15:11:43 -0800 |
| commit | 026df005fbe448090eebfebeab9a3ada24e4823c (patch) | |
| tree | 8831a726c4fca9c9b69e042af7c036d3a7ee6732 /src | |
| parent | 049abba5a2634f37f73d2abe83906cc71b8ad3f7 (diff) | |
| parent | 74c28d1a6cf13fdfa55ff9518d2b27be10d01f6e (diff) | |
| download | android_packages_apps_Trebuchet-026df005fbe448090eebfebeab9a3ada24e4823c.tar.gz android_packages_apps_Trebuchet-026df005fbe448090eebfebeab9a3ada24e4823c.tar.bz2 android_packages_apps_Trebuchet-026df005fbe448090eebfebeab9a3ada24e4823c.zip | |
Merge "Fixing bug where drag would sometimes get cancelled inadvertently" into ics-mr1
Diffstat (limited to 'src')
| -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 88f795445..ea7c0be7a 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -2363,6 +2363,7 @@ public class Workspace extends SmoothPagedView mDragTargetLayout.onDragExit(); } mLastDragOverView = null; + mSpringLoadedDragController.cancel(); if (!mIsPageMoving) { hideOutlines(); |