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
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 732bfbd..bf0eb12 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -133,6 +133,8 @@
// (SmoothPagedView does this)
protected boolean mDeferScrollUpdate = false;
+ protected boolean mIsPageMoving = false;
+
/**
* Simple cache mechanism for PagedViewIcon outlines.
*/
@@ -159,11 +161,6 @@
void onPageSwitch(View newPage, int newPageIndex);
}
- public interface PageMovingListener {
- void onPageBeginMoving();
- void onPageEndMoving();
- }
-
public PagedView(Context context) {
this(context, null);
}
@@ -257,12 +254,22 @@
}
}
- // a method that subclasses can override to add behavior
- protected void pageBeginMoving() {
+ private void pageBeginMoving() {
+ mIsPageMoving = true;
+ onPageBeginMoving();
+ }
+
+ private void pageEndMoving() {
+ onPageEndMoving();
+ mIsPageMoving = false;
}
// a method that subclasses can override to add behavior
- protected void pageEndMoving() {
+ protected void onPageBeginMoving() {
+ }
+
+ // a method that subclasses can override to add behavior
+ protected void onPageEndMoving() {
}
/**
@@ -657,12 +664,9 @@
case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
- // Release the drag
- pageEndMoving();
mTouchState = TOUCH_STATE_REST;
mAllowLongPress = false;
mActivePointerId = INVALID_POINTER;
-
break;
case MotionEvent.ACTION_POINTER_UP: