diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-06-14 17:42:35 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-06-14 17:43:44 -0700 |
| commit | 7c4c5108295db764ba091cc0ffd7af335a166449 (patch) | |
| tree | 2b0d67bad56adba11cf6277c59247e4d54bac63c /src/com/android/launcher3/DragController.java | |
| parent | a0b5749433c66b6fed5c6026414ef438a938089b (diff) | |
| download | android_packages_apps_Trebuchet-7c4c5108295db764ba091cc0ffd7af335a166449.tar.gz android_packages_apps_Trebuchet-7c4c5108295db764ba091cc0ffd7af335a166449.tar.bz2 android_packages_apps_Trebuchet-7c4c5108295db764ba091cc0ffd7af335a166449.zip | |
HACK: Fixing major persistence regression associated with extra screen to the left
-> Also adding ability to delete shortcuts.
Change-Id: I263baf813eae9089f11288494d575a99f0e859c3
Diffstat (limited to 'src/com/android/launcher3/DragController.java')
| -rw-r--r-- | src/com/android/launcher3/DragController.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java index e0de5b459..54f7dbc15 100644 --- a/src/com/android/launcher3/DragController.java +++ b/src/com/android/launcher3/DragController.java @@ -444,6 +444,9 @@ public class DragController { mLastTouchUpTime = System.currentTimeMillis(); if (mDragging) { PointF vec = isFlingingToDelete(mDragObject.dragSource); + if (!DeleteDropTarget.willAcceptDrop(mDragObject.dragInfo)) { + vec = null; + } if (vec != null) { dropOnFlingToDeleteTarget(dragLayerX, dragLayerY, vec); } else { @@ -597,8 +600,7 @@ public class DragController { if (mDragging) { PointF vec = isFlingingToDelete(mDragObject.dragSource); - if (!(mDragObject.dragInfo instanceof LauncherAppWidgetInfo) && - !(mDragObject.dragInfo instanceof PendingAddWidgetInfo)) { + if (!DeleteDropTarget.willAcceptDrop(mDragObject.dragInfo)) { vec = null; } if (vec != null) { |