diff options
| author | Winson Chung <winsonc@google.com> | 2011-10-03 15:15:18 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-10-03 15:15:51 -0700 |
| commit | 3e0839e5f830ab7e64223ebe186d97729eda3e22 (patch) | |
| tree | 512fbc08bf90cdbf6ade6e98c8adf753b4a0e336 /src/com/android/launcher2/DragController.java | |
| parent | e4a647f8793ce7823394db43d6af57f9eab8a340 (diff) | |
| download | android_packages_apps_Trebuchet-3e0839e5f830ab7e64223ebe186d97729eda3e22.tar.gz android_packages_apps_Trebuchet-3e0839e5f830ab7e64223ebe186d97729eda3e22.tar.bz2 android_packages_apps_Trebuchet-3e0839e5f830ab7e64223ebe186d97729eda3e22.zip | |
Fixing issue where dragging in the hotseat could trigger scrolling to side pages. (Bug: 5151006)
Change-Id: I1b1b98ecc87180fa5994f46194f1b5668e618b91
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
| -rw-r--r-- | src/com/android/launcher2/DragController.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index ca7e55b64..107f8ef9d 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -484,16 +484,18 @@ public class DragController { if (!inDeleteRegion && x < mScrollZone) { if (mScrollState == SCROLL_OUTSIDE_ZONE && mDistanceSinceScroll > slop) { mScrollState = SCROLL_WAITING_IN_ZONE; - mScrollRunnable.setDirection(SCROLL_LEFT); - mHandler.postDelayed(mScrollRunnable, SCROLL_DELAY); - mDragScroller.onEnterScrollArea(x, y, SCROLL_LEFT); + if (mDragScroller.onEnterScrollArea(x, y, SCROLL_LEFT)) { + mScrollRunnable.setDirection(SCROLL_LEFT); + mHandler.postDelayed(mScrollRunnable, SCROLL_DELAY); + } } } else if (!inDeleteRegion && x > mScrollView.getWidth() - mScrollZone) { if (mScrollState == SCROLL_OUTSIDE_ZONE && mDistanceSinceScroll > slop) { mScrollState = SCROLL_WAITING_IN_ZONE; - mScrollRunnable.setDirection(SCROLL_RIGHT); - mHandler.postDelayed(mScrollRunnable, SCROLL_DELAY); - mDragScroller.onEnterScrollArea(x, y, SCROLL_RIGHT); + if (mDragScroller.onEnterScrollArea(x, y, SCROLL_RIGHT)) { + mScrollRunnable.setDirection(SCROLL_RIGHT); + mHandler.postDelayed(mScrollRunnable, SCROLL_DELAY); + } } } else { if (mScrollState == SCROLL_WAITING_IN_ZONE) { |