PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 3237665: Home screen should scroll on tap, not touch down

Browse Source 
Change-Id: I61f65beaf982eec54b86668d6da94aa5c52e9355
This commit is contained in:
Patrick Dubroy
2011-01-19 18:47:27 -08:00
parent f4ffdc63d3
commit d0ce1ec2e2
2 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/PagedView.java
+19 -12
View File
@@ -696,6 +696,20 @@ public abstract class PagedView extends ViewGroup {
super.requestDisallowInterceptTouchEvent(disallowIntercept);
}
/**
* Return true if a tap at (x, y) should trigger a flip to the previous page.
*/
protected boolean hitsPreviousPage(float x, float y) {
return (x < getRelativeChildOffset(mCurrentPage) - mPageSpacing);
}
/**
* Return true if a tap at (x, y) should trigger a flip to the next page.
*/
protected boolean hitsNextPage(float x, float y) {
return (x > (getMeasuredWidth() - getRelativeChildOffset(mCurrentPage) + mPageSpacing));
}
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
/*
@@ -761,14 +775,11 @@ public abstract class PagedView extends ViewGroup {
// check if this can be the beginning of a tap on the side of the pages
// to scroll the current page
if ((mTouchState != TOUCH_STATE_PREV_PAGE) && !handlePagingClicks() &&
(mTouchState != TOUCH_STATE_NEXT_PAGE)) {
if (mTouchState != TOUCH_STATE_PREV_PAGE && mTouchState != TOUCH_STATE_NEXT_PAGE) {
if (getChildCount() > 0) {
int width = getMeasuredWidth();
int offset = getRelativeChildOffset(mCurrentPage);
if (x < offset - mPageSpacing) {
if (hitsPreviousPage(x, y)) {
mTouchState = TOUCH_STATE_PREV_PAGE;
} else if (x > (width - offset + mPageSpacing)) {
} else if (hitsNextPage(x, y)) {
mTouchState = TOUCH_STATE_NEXT_PAGE;
}
}
@@ -856,10 +867,6 @@ public abstract class PagedView extends ViewGroup {
}
}
protected boolean handlePagingClicks() {
return false;
}
// This curve determines how the effect of scrolling over the limits of the page dimishes
// as the user pulls further and further from the bounds
private float overScrollInfluenceCurve(float f) {
@@ -966,7 +973,7 @@ public abstract class PagedView extends ViewGroup {
} else {
snapToDestination();
}
} else if (mTouchState == TOUCH_STATE_PREV_PAGE && !handlePagingClicks()) {
} else if (mTouchState == TOUCH_STATE_PREV_PAGE) {
// at this point we have not moved beyond the touch slop
// (otherwise mTouchState would be TOUCH_STATE_SCROLLING), so
// we can just page
@@ -976,7 +983,7 @@ public abstract class PagedView extends ViewGroup {
} else {
snapToDestination();
}
} else if (mTouchState == TOUCH_STATE_NEXT_PAGE && !handlePagingClicks()) {
} else if (mTouchState == TOUCH_STATE_NEXT_PAGE) {
// at this point we have not moved beyond the touch slop
// (otherwise mTouchState would be TOUCH_STATE_SCROLLING), so
// we can just page