DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller

adamp · adamp · commit a55191fe8f96 · 2010-08-05T15:50:31.000-07:00
Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63
diff --git a/core/java/android/widget/Scroller.java b/core/java/android/widget/Scroller.java
@@ -218,7 +218,11 @@ public boolean computeScrollOffset() {
                 // Pin to mMinY <= mCurrY <= mMaxY
                 mCurrY = Math.min(mCurrY, mMaxY);
                 mCurrY = Math.max(mCurrY, mMinY);
-                
+
+                if (mCurrX == mFinalX && mCurrY == mFinalY) {
+                    mFinished = true;
+                }
+
                 break;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,11 @@ public boolean computeScrollOffset() {`
`218`	`218`	`// Pin to mMinY <= mCurrY <= mMaxY`
`219`	`219`	`mCurrY = Math.min(mCurrY, mMaxY);`
`220`	`220`	`mCurrY = Math.max(mCurrY, mMinY);`
`221`		`-`
	`221`	`+`
	`222`	`+ if (mCurrX == mFinalX && mCurrY == mFinalY) {`
	`223`	`+ mFinished = true;`
	`224`	`+ }`
	`225`	`+`
`222`	`226`	`break;`
`223`	`227`	`}`
`224`	`228`	`}`