diff options
| author | Winson Chung <winsonc@google.com> | 2013-11-14 19:19:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-14 19:19:25 +0000 |
| commit | 89ee93e0f8b6ac1ed6aefc2b940d1606f2027491 (patch) | |
| tree | 28a865dcb28145e8218fac71351cff52bac45ba5 /src/com/android/launcher3/DragController.java | |
| parent | 4e2683a4b582d28bb320308b5e5f3541ae1aa310 (diff) | |
| parent | eeb5bbc9409978cc2ae52d48380399fcde3d9f85 (diff) | |
| download | android_packages_apps_Trebuchet-89ee93e0f8b6ac1ed6aefc2b940d1606f2027491.tar.gz android_packages_apps_Trebuchet-89ee93e0f8b6ac1ed6aefc2b940d1606f2027491.tar.bz2 android_packages_apps_Trebuchet-89ee93e0f8b6ac1ed6aefc2b940d1606f2027491.zip | |
Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
Diffstat (limited to 'src/com/android/launcher3/DragController.java')
| -rw-r--r-- | src/com/android/launcher3/DragController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java index ab4823343..1bfaa233b 100644 --- a/src/com/android/launcher3/DragController.java +++ b/src/com/android/launcher3/DragController.java @@ -198,7 +198,7 @@ public class DragController { * @param dragRegion Coordinates within the bitmap b for the position of item being dragged. * Makes dragging feel more precise, e.g. you can clip out a transparent border */ - public void startDrag(Bitmap b, int dragLayerX, int dragLayerY, + public DragView startDrag(Bitmap b, int dragLayerX, int dragLayerY, DragSource source, Object dragInfo, int dragAction, Point dragOffset, Rect dragRegion, float initialDragViewScale) { if (PROFILE_DRAWING_DURING_DRAG) { @@ -245,6 +245,7 @@ public class DragController { mLauncher.getDragLayer().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); dragView.show(mMotionDownX, mMotionDownY); handleMoveEvent(mMotionDownX, mMotionDownY); + return dragView; } /** |