diff options
author | Patrick Dubroy <dubroy@google.com> | 2010-10-06 15:49:50 -0700 |
---|---|---|
committer | Patrick Dubroy <dubroy@google.com> | 2010-10-06 17:39:05 -0700 |
commit | 1262e369484ce7f2565655ed80e6299232c70bd7 (patch) | |
tree | 91e599271b6d0bdbbc60889af8a73ce8d4b595d5 /src/com/android/launcher2/DragController.java | |
parent | 7ed39f3362e4701101967339b1be41b365712d1c (diff) | |
download | android_packages_apps_Trebuchet-1262e369484ce7f2565655ed80e6299232c70bd7.tar.gz android_packages_apps_Trebuchet-1262e369484ce7f2565655ed80e6299232c70bd7.tar.bz2 android_packages_apps_Trebuchet-1262e369484ce7f2565655ed80e6299232c70bd7.zip |
wip 3029324: Implement new drag feedback
- Show page borders when dragging
- Enlarge scroll region (landscape only)
- When inside scroll region, show green border on adjacent page
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
-rw-r--r-- | src/com/android/launcher2/DragController.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index d54434002..68dfb35fc 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -56,8 +56,8 @@ public class DragController { private static final int SCROLL_OUTSIDE_ZONE = 0; private static final int SCROLL_WAITING_IN_ZONE = 1; - private static final int SCROLL_LEFT = 0; - private static final int SCROLL_RIGHT = 1; + static final int SCROLL_LEFT = 0; + static final int SCROLL_RIGHT = 1; private Context mContext; private Handler mHandler; @@ -156,6 +156,10 @@ public class DragController { mScrollZone = context.getResources().getDimensionPixelSize(R.dimen.scroll_zone); } + public boolean dragging() { + return mDragging; + } + /** * Starts a drag. * @@ -487,18 +491,21 @@ public class DragController { mScrollState = SCROLL_WAITING_IN_ZONE; mScrollRunnable.setDirection(SCROLL_LEFT); mHandler.postDelayed(mScrollRunnable, SCROLL_DELAY); + mDragScroller.onEnterScrollArea(SCROLL_LEFT); } } else if (!inDeleteRegion && x > mScrollView.getWidth() - mScrollZone) { if (mScrollState == SCROLL_OUTSIDE_ZONE) { mScrollState = SCROLL_WAITING_IN_ZONE; mScrollRunnable.setDirection(SCROLL_RIGHT); mHandler.postDelayed(mScrollRunnable, SCROLL_DELAY); + mDragScroller.onEnterScrollArea(SCROLL_RIGHT); } } else { if (mScrollState == SCROLL_WAITING_IN_ZONE) { mScrollState = SCROLL_OUTSIDE_ZONE; mScrollRunnable.setDirection(SCROLL_RIGHT); mHandler.removeCallbacks(mScrollRunnable); + mDragScroller.onExitScrollArea(); } } } |