diff options
Diffstat (limited to 'src/com/android/launcher3/DragController.java')
-rw-r--r-- | src/com/android/launcher3/DragController.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java index 4c4f399a9..5b5c35c5a 100644 --- a/src/com/android/launcher3/DragController.java +++ b/src/com/android/launcher3/DragController.java @@ -24,8 +24,8 @@ import android.graphics.PointF; import android.graphics.Rect; import android.os.Handler; import android.os.IBinder; -import android.os.Vibrator; import android.util.Log; +import android.view.HapticFeedbackConstants; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.VelocityTracker; @@ -50,8 +50,7 @@ public class DragController { public static int DRAG_ACTION_COPY = 1; private static final int SCROLL_DELAY = 500; - private static final int RESCROLL_DELAY = 750; - private static final int VIBRATE_DURATION = 15; + private static final int RESCROLL_DELAY = PagedView.PAGE_SNAP_ANIMATION_DURATION + 150; private static final boolean PROFILE_DRAWING_DURING_DRAG = false; @@ -66,7 +65,6 @@ public class DragController { private Launcher mLauncher; private Handler mHandler; - private final Vibrator mVibrator; // temporaries to avoid gc thrash private Rect mRectTemp = new Rect(); @@ -150,7 +148,6 @@ public class DragController { mHandler = new Handler(); mScrollZone = r.getDimensionPixelSize(R.dimen.scroll_zone); mVelocityTracker = VelocityTracker.obtain(); - mVibrator = (Vibrator) launcher.getSystemService(Context.VIBRATOR_SERVICE); float density = r.getDisplayMetrics().density; mFlingToDeleteThresholdVelocity = @@ -240,8 +237,6 @@ public class DragController { mDragObject.dragSource = source; mDragObject.dragInfo = dragInfo; - mVibrator.vibrate(VIBRATE_DURATION); - final DragView dragView = mDragObject.dragView = new DragView(mLauncher, b, registrationX, registrationY, 0, 0, b.getWidth(), b.getHeight(), initialDragViewScale); @@ -252,6 +247,7 @@ public class DragController { dragView.setDragRegion(new Rect(dragRegion)); } + mLauncher.getDragLayer().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); dragView.show(mMotionDownX, mMotionDownY); handleMoveEvent(mMotionDownX, mMotionDownY); } @@ -506,6 +502,8 @@ public class DragController { public void forceTouchMove() { int[] dummyCoordinates = mCoordinatesTemp; DropTarget dropTarget = findDropTarget(mLastTouch[0], mLastTouch[1], dummyCoordinates); + mDragObject.x = dummyCoordinates[0]; + mDragObject.y = dummyCoordinates[1]; checkTouchMove(dropTarget); } |