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

Commit d6f37d72 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Prevent scroll views from sending duplicate onScrollChanged events."

parents a0620cb5 cb25bd8c

core/java/android/widget/HorizontalScrollView.java

+5 −1
Original line number Diff line number Diff line
@@ -595,12 +595,13 @@ public class HorizontalScrollView extends FrameLayout { 
                    final boolean canOverscroll = overscrollMode == OVER_SCROLL_ALWAYS ||

                            (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0);



                    // Calling overScrollBy will call onOverScrolled, which

                    // calls onScrollChanged if applicable.

                    if (overScrollBy(deltaX, 0, mScrollX, 0, range, 0,

                            mOverscrollDistance, 0, true)) {

                        // Break our velocity if we hit a scroll barrier.

                        mVelocityTracker.clear();

                    }

                    onScrollChanged(mScrollX, mScrollY, oldX, oldY);



                    if (canOverscroll) {

                        final int pulledToX = oldX + deltaX;
@@ -732,9 +733,12 @@ public class HorizontalScrollView extends FrameLayout { 
            boolean clampedX, boolean clampedY) {

        // Treat animating scrolls differently; see #computeScroll() for why.

        if (!mScroller.isFinished()) {

            final int oldX = mScrollX;

            final int oldY = mScrollY;

            mScrollX = scrollX;

            mScrollY = scrollY;

            invalidateParentIfNeeded();

            onScrollChanged(mScrollX, mScrollY, oldX, oldY);

            if (clampedX) {

                mScroller.springBack(mScrollX, mScrollY, 0, getScrollRange(), 0, 0);

            }

core/java/android/widget/ScrollView.java

+5 −1
Original line number Diff line number Diff line
@@ -631,12 +631,13 @@ public class ScrollView extends FrameLayout { 
                    final boolean canOverscroll = overscrollMode == OVER_SCROLL_ALWAYS ||

                            (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0);



                    // Calling overScrollBy will call onOverScrolled, which

                    // calls onScrollChanged if applicable.

                    if (overScrollBy(0, deltaY, 0, mScrollY,

                            0, range, 0, mOverscrollDistance, true)) {

                        // Break our velocity if we hit a scroll barrier.

                        mVelocityTracker.clear();

                    }

                    onScrollChanged(mScrollX, mScrollY, oldX, oldY);



                    if (canOverscroll) {

                        final int pulledToY = oldY + deltaY;
@@ -753,9 +754,12 @@ public class ScrollView extends FrameLayout { 
            boolean clampedX, boolean clampedY) {

        // Treat animating scrolls differently; see #computeScroll() for why.

        if (!mScroller.isFinished()) {

            final int oldX = mScrollX;

            final int oldY = mScrollY;

            mScrollX = scrollX;

            mScrollY = scrollY;

            invalidateParentIfNeeded();

            onScrollChanged(mScrollX, mScrollY, oldX, oldY);

            if (clampedY) {

                mScroller.springBack(mScrollX, mScrollY, 0, 0, 0, getScrollRange());

            }