commit a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a
author Adam Powell <adamp@google.com> Wed Jul 28 16:56:13 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 28 16:56:13 2010 -0700
tree 13aab5c9a7962f9f3cbc2fa983e0e2ce17d73a8e
parent 3de27d5a56f4b9e3d76ac71445b33e47c635d207
parent 1b088be8bb304e4ab7a1896d3ec3b9df9d9cf68e

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

core/java/android/widget/Scroller.java

diff --git a/core/java/android/widget/Scroller.java b/core/java/android/widget/Scroller.java
index 784a75f..4cb0839 100644
--- a/core/java/android/widget/Scroller.java
+++ b/core/java/android/widget/Scroller.java
@@ -218,7 +218,11 @@
                 // Pin to mMinY <= mCurrY <= mMaxY
                 mCurrY = Math.min(mCurrY, mMaxY);
                 mCurrY = Math.max(mCurrY, mMinY);
-                
+
+                if (mCurrX == mFinalX && mCurrY == mFinalY) {
+                    mFinished = true;
+                }
+
                 break;
             }
         }