Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread

2010-07-28 16:56:13 -07:00
parent 3de27d5a56 1b088be8bb
commit a0ae8bc5c6
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;
            }
        }