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

Merge commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a' into gingerbread-plus-aosp

* commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a':
  Fix a bug that could cause flings to last too long using a Scroller

1 files changed, 5 insertions, 1 deletions

diff --git a/core/java/android/widget/Scroller.java b/core/java/android/widget/Scroller.java
index 784a75f22a7c..4cb0839036f2 100644
--- 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;
             }
         }