Merge "Fix a bug in OverScroller.setFinalX/Y" (dbc96e18) · Commits · e / os / android_frameworks_base

core/java/android/widget/OverScroller.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,12 @@ public class OverScroller {
		*/
		public void setFinalX(int newX) {
		if (mScrollMode == MODE_DEFAULT) {
		if (newX < mMinimumX) {
		mMinimumX = newX;
		}
		if (newX > mMaximumX) {
		mMaximumX = newX;
		}
		mDefaultScroller.setFinalX(newX);
		}
		}
		@@ -431,6 +437,12 @@ public class OverScroller {
		*/
		public void setFinalY(int newY) {
		if (mScrollMode == MODE_DEFAULT) {
		if (newY < mMinimumY) {
		mMinimumY = newY;
		}
		if (newY > mMaximumY) {
		mMaximumY = newY;
		}
		mDefaultScroller.setFinalY(newY);
		}
		}