am 46830418: am 2da0a053: Fix small scrolling regression

* commit '4683041885e6a8338dc3111a9e3f15cc7c62611e': Fix small scrolling regression
2013-11-08 07:32:01 -08:00
parent 98e011b40a 4683041885
commit b767166b3a
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;