diff options
author | Winson Chung <winsonc@google.com> | 2013-04-01 18:21:28 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-04-01 18:21:28 -0700 |
commit | 25460a1d5cb473033408c9e76898bb77e785c66f (patch) | |
tree | 09c9b8812a8f406c41fff4ace4992ed866abd191 /src/com/android | |
parent | e233a8bf79d624c5419805fde4bb0e025c66b020 (diff) | |
download | android_packages_apps_Trebuchet-25460a1d5cb473033408c9e76898bb77e785c66f.tar.gz android_packages_apps_Trebuchet-25460a1d5cb473033408c9e76898bb77e785c66f.tar.bz2 android_packages_apps_Trebuchet-25460a1d5cb473033408c9e76898bb77e785c66f.zip |
Fixing issue where drag view is jumping when you scroll from hovering over an edge. (Bug 8522679)
Change-Id: Ie523e718bd1b558db9608aa66f6c353e4b8e1a14
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher2/DragController.java | 35 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 2 |
2 files changed, 22 insertions, 15 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index 3e586bf61..1d6472ffe 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -488,6 +488,23 @@ public class DragController { DropTarget dropTarget = findDropTarget(x, y, coordinates); mDragObject.x = coordinates[0]; mDragObject.y = coordinates[1]; + checkTouchMove(dropTarget); + + // Check if we are hovering over the scroll areas + mDistanceSinceScroll += + Math.sqrt(Math.pow(mLastTouch[0] - x, 2) + Math.pow(mLastTouch[1] - y, 2)); + mLastTouch[0] = x; + mLastTouch[1] = y; + checkScrollState(x, y); + } + + public void forceTouchMove() { + int[] dummyCoordinates = mCoordinatesTemp; + DropTarget dropTarget = findDropTarget(mLastTouch[0], mLastTouch[1], dummyCoordinates); + checkTouchMove(dropTarget); + } + + private void checkTouchMove(DropTarget dropTarget) { if (dropTarget != null) { DropTarget delegate = dropTarget.getDropTargetDelegate(mDragObject); if (delegate != null) { @@ -507,14 +524,10 @@ public class DragController { } } mLastDropTarget = dropTarget; + } - // After a scroll, the touch point will still be in the scroll region. - // Rather than scrolling immediately, require a bit of twiddling to scroll again + private void checkScrollState(int x, int y) { final int slop = ViewConfiguration.get(mLauncher).getScaledWindowTouchSlop(); - mDistanceSinceScroll += - Math.sqrt(Math.pow(mLastTouch[0] - x, 2) + Math.pow(mLastTouch[1] - y, 2)); - mLastTouch[0] = x; - mLastTouch[1] = y; final int delay = mDistanceSinceScroll < slop ? RESCROLL_DELAY : SCROLL_DELAY; if (x < mScrollZone) { @@ -540,12 +553,6 @@ public class DragController { } } - public void forceMoveEvent() { - if (mDragging) { - handleMoveEvent(mDragObject.x, mDragObject.y); - } - } - /** * Call this from a drag source view. */ @@ -796,8 +803,8 @@ public class DragController { mLauncher.getDragLayer().onExitScrollArea(); if (isDragging()) { - // Force an update so that we can requeue the scroller if necessary - forceMoveEvent(); + // Check the scroll again so that we can requeue the scroller if necessary + checkScrollState(mLastTouch[0], mLastTouch[1]); } } } diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 7d7ca8614..d4488db2e 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -773,7 +773,7 @@ public class Workspace extends SmoothPagedView if (isSmall()) { // If we are in springloaded mode, then force an event to check if the current touch // is under a new page (to scroll to) - mDragController.forceMoveEvent(); + mDragController.forceTouchMove(); } } else { // If we are not mid-dragging, hide the page outlines if we are on a large screen |