diff options
| author | Winson Chung <winsonc@google.com> | 2011-07-29 14:49:10 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-08-02 14:06:55 -0700 |
| commit | 1c4cf4a11f3f7f24bbf65f958fdd22295d0bbd55 (patch) | |
| tree | 9805fe46eedfe4c1ee7bee5148b60b9ebea98987 /src/com/android/launcher2/DragController.java | |
| parent | ed51cc9a12c50d12e7d30ed209a49f1a40858043 (diff) | |
| download | android_packages_apps_Trebuchet-1c4cf4a11f3f7f24bbf65f958fdd22295d0bbd55.tar.gz android_packages_apps_Trebuchet-1c4cf4a11f3f7f24bbf65f958fdd22295d0bbd55.tar.bz2 android_packages_apps_Trebuchet-1c4cf4a11f3f7f24bbf65f958fdd22295d0bbd55.zip | |
Minor bug fixes
- Making the spring loaded side page hovers slightly faster
- Fixing issue where you can't drag over another item on another page to create a portal
- Ignoring side pages while hovering over hotseat
- Fixing issue where hotseat may be stuck in shrunken state (and removing the scale on the hotseat)
Change-Id: I87d50a1bdc451704285482c79caed0982a5a7f5a
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
| -rw-r--r-- | src/com/android/launcher2/DragController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index eb0db69eb..28c53d163 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -483,14 +483,14 @@ public class DragController { mScrollState = SCROLL_WAITING_IN_ZONE; mScrollRunnable.setDirection(SCROLL_LEFT); mHandler.postDelayed(mScrollRunnable, SCROLL_DELAY); - mDragScroller.onEnterScrollArea(SCROLL_LEFT); + mDragScroller.onEnterScrollArea(x, y, SCROLL_LEFT); } } 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(SCROLL_RIGHT); + mDragScroller.onEnterScrollArea(x, y, SCROLL_RIGHT); } } else { if (mScrollState == SCROLL_WAITING_IN_ZONE) { |