Merge "Fix nested prescrolling bug in ScrollView" (ccd3a6a5) · Commits · e / os / android_frameworks_base

core/java/android/widget/ScrollView.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -628,7 +628,7 @@ public class ScrollView extends FrameLayout {
	final int y = (int) ev.getY(activePointerIndex);		final int y = (int) ev.getY(activePointerIndex);
	int deltaY = mLastMotionY - y;		int deltaY = mLastMotionY - y;
	if (dispatchNestedPreScroll(0, deltaY, mScrollConsumed, mScrollOffset)) {		if (dispatchNestedPreScroll(0, deltaY, mScrollConsumed, mScrollOffset)) {
	deltaY -= mScrollConsumed[1] + mScrollOffset[1];		deltaY -= mScrollConsumed[1];
	vtev.offsetLocation(0, mScrollOffset[1]);		vtev.offsetLocation(0, mScrollOffset[1]);
	}		}
	if (!mIsBeingDragged && Math.abs(deltaY) > mTouchSlop) {		if (!mIsBeingDragged && Math.abs(deltaY) > mTouchSlop) {
	@@ -645,7 +645,7 @@ public class ScrollView extends FrameLayout {
	}		}
	if (mIsBeingDragged) {		if (mIsBeingDragged) {
	// Scroll to follow the motion event		// Scroll to follow the motion event
	mLastMotionY = y;		mLastMotionY = y - mScrollOffset[1];

	final int oldY = mScrollY;		final int oldY = mScrollY;
	final int range = getScrollRange();		final int range = getScrollRange();