am b767166b: am 46830418: am 2da0a053: Fix small scrolling regression

* commit 'b767166b3ab8c18d277271167c390c8eb2088302': Fix small scrolling regression
2014-02-14 20:37:43 +00:00
parent 585e1ea5f9 b767166b3a
commit 39ea51061c
1 changed files with 5 additions and 2 deletions
@@ -1368,10 +1368,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
                 */
                final int xDist = Math.abs(mScroller.getFinalX() - mScroller.getCurrX());
                final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop);
+
                if (finishedScrolling) {
                    mTouchState = TOUCH_STATE_REST;
-                    mScrollAbortedFromIntercept = true;
-                    abortScrollerAnimation(false);
+                    if (!mScroller.isFinished()) {
+                        mScrollAbortedFromIntercept = true;
+                        abortScrollerAnimation(false);
+                    }
                } else {
                    if (isTouchPointInViewportWithBuffer((int) mDownMotionX, (int) mDownMotionY)) {
                        mTouchState = TOUCH_STATE_SCROLLING;