diff options
| author | Patrick Dubroy <dubroy@google.com> | 2010-07-16 15:49:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-16 15:49:32 -0700 |
| commit | 5999f114b94921f6a3605b62177471b503191708 (patch) | |
| tree | 974cfc881950e3d7f0965a7ba2a015c0854d1729 /src | |
| parent | 8f86ddcb90063a56c25c9c782316574bc4e5dd93 (diff) | |
| parent | c1701ad4b2f7e8edf03438df26e1c2161d034847 (diff) | |
| download | android_packages_apps_Trebuchet-5999f114b94921f6a3605b62177471b503191708.tar.gz android_packages_apps_Trebuchet-5999f114b94921f6a3605b62177471b503191708.tar.bz2 android_packages_apps_Trebuchet-5999f114b94921f6a3605b62177471b503191708.zip | |
Merge "Fix null pointer when dragging outside of workspace."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/DragController.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index f2fad9a08..0130ba93c 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -394,13 +394,14 @@ public class DragController { // Drop on someone? final int[] coordinates = mCoordinatesTemp; DropTarget dropTarget = findDropTarget(screenX, screenY, coordinates); - DropTarget delegate = dropTarget.getDropTargetDelegate( - mDragSource, coordinates[0], coordinates[1], - (int) mTouchOffsetX, (int) mTouchOffsetY, mDragView, mDragInfo); - if (delegate != null) { - dropTarget = delegate; - } if (dropTarget != null) { + DropTarget delegate = dropTarget.getDropTargetDelegate( + mDragSource, coordinates[0], coordinates[1], + (int) mTouchOffsetX, (int) mTouchOffsetY, mDragView, mDragInfo); + if (delegate != null) { + dropTarget = delegate; + } + if (mLastDropTarget == dropTarget) { dropTarget.onDragOver(mDragSource, coordinates[0], coordinates[1], (int) mTouchOffsetX, (int) mTouchOffsetY, mDragView, mDragInfo); |