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

am 46830418: am 2da0a053: Fix small scrolling regression

Browse Source 
* commit '4683041885e6a8338dc3111a9e3f15cc7c62611e':
  Fix small scrolling regression
This commit is contained in:
Adam Cohen
2013-11-08 07:32:01 -08:00
committed by Android Git Automerger
parent 98e011b40a 4683041885
commit b767166b3a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/PagedView.java
+5 -2
View File
@@ -1368,10 +1368,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
*/ */
final int xDist = Math.abs(mScroller.getFinalX() - mScroller.getCurrX()); final int xDist = Math.abs(mScroller.getFinalX() - mScroller.getCurrX());
final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop); final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop);
if (finishedScrolling) { if (finishedScrolling) {
mTouchState = TOUCH_STATE_REST; mTouchState = TOUCH_STATE_REST;
mScrollAbortedFromIntercept = true; if (!mScroller.isFinished()) {
abortScrollerAnimation(false); mScrollAbortedFromIntercept = true;
abortScrollerAnimation(false);
}
} else { } else {
if (isTouchPointInViewportWithBuffer((int) mDownMotionX, (int) mDownMotionY)) { if (isTouchPointInViewportWithBuffer((int) mDownMotionX, (int) mDownMotionY)) {
mTouchState = TOUCH_STATE_SCROLLING; mTouchState = TOUCH_STATE_SCROLLING;