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

Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63
2010-07-23 15:49:03 -07:00
parent 982f1521a6
commit a55191fe8f
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/widget/Scroller.java
+++ b/core/java/android/widget/Scroller.java
@@ -218,7 +218,11 @@ public class Scroller  {
                // Pin to mMinY <= mCurrY <= mMaxY
                mCurrY = Math.min(mCurrY, mMaxY);
                mCurrY = Math.max(mCurrY, mMinY);
-                
+
+                if (mCurrX == mFinalX && mCurrY == mFinalY) {
+                    mFinished = true;
+                }
+
                break;
            }
        }