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

Commit b039fd4c authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fixed an overscrolling bug in AbsListView with a root in OverScroller."

parents 5258919f eb6b1fa7

core/java/android/widget/AbsListView.java

+3 −3
Original line number Diff line number Diff line
@@ -1892,9 +1892,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        // Check if we have moved far enough that it looks more like a

        // scroll than a tap

        final int distance = Math.abs(deltaY);

        if (distance > mTouchSlop) {

        final boolean overscroll = mScrollY != 0;

        if (overscroll || distance > mTouchSlop) {

            createScrollingCache();

            mTouchMode = TOUCH_MODE_SCROLL;

            mTouchMode = overscroll ? TOUCH_MODE_OVERSCROLL : TOUCH_MODE_SCROLL;

            mMotionCorrection = deltaY;

            final Handler handler = getHandler();

            // Handler should not be null unless the AbsListView is not attached to a
@@ -2097,7 +2098,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                        // Check to see if we are back in 

                        View motionView = this.getChildAt(mMotionPosition - mFirstPosition);

                        if (motionView != null) {

                            int topOffset = motionView.getTop() - mMotionViewNewTop;

                            mTouchMode = TOUCH_MODE_SCROLL;



                            // We did not scroll the full amount. Treat this essentially like the

core/java/android/widget/OverScroller.java

+2 −2
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ public class OverScroller { 
        final float durationSecs = (OVERFLING_DURATION / 1000.f);

        int dx = (int)(xvel * durationSecs) / 8;

        int dy = (int)(yvel * durationSecs) / 8;

        scroller.startScroll(startx, starty, dx, dy, OVERFLING_DURATION);

        mCurrScroller.abortAnimation();

        scroller.startScroll(startx, starty, dx, dy, OVERFLING_DURATION);

        mCurrScroller = scroller;

        mScrollMode = MODE_OVERFLING;

    }
@@ -164,8 +164,8 @@ public class OverScroller { 
        }

        

        if (xoff != 0 || yoff != 0) {

            scroller.startScroll(startX, startY, xoff, yoff, SPRINGBACK_DURATION);

            mCurrScroller.abortAnimation();

            scroller.startScroll(startX, startY, xoff, yoff, SPRINGBACK_DURATION);

            mCurrScroller = scroller;

            mScrollMode = MODE_SPRINGBACK;

            return true;