Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46830418 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 2da0a053: Fix small scrolling regression 

* commit '2da0a053':
  Fix small scrolling regression
parents d7adbab6 2da0a053

src/com/android/launcher3/PagedView.java

+5 −2
Original line number Diff line number Diff line
@@ -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;

                    if (!mScroller.isFinished()) {

                        mScrollAbortedFromIntercept = true;

                        abortScrollerAnimation(false);

                    }

                } else {

                    if (isTouchPointInViewportWithBuffer((int) mDownMotionX, (int) mDownMotionY)) {

                        mTouchState = TOUCH_STATE_SCROLLING;