diff options
| author | Adam Powell <adamp@google.com> | 2010-08-05 18:33:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-05 18:33:31 -0700 |
| commit | 9093717985095913934c079abfa879049bd33ba5 (patch) | |
| tree | 34f991e75c75ea1f270cbc9bb2c522a667f35dc5 /core/java | |
| parent | cdf16787fc1234b7f21a9cddc6f8a27b4056bc39 (diff) | |
| parent | a55191fe8f967cd74c5669447fb9b861c72bbd00 (diff) | |
| download | frameworks_base-9093717985095913934c079abfa879049bd33ba5.zip frameworks_base-9093717985095913934c079abfa879049bd33ba5.tar.gz frameworks_base-9093717985095913934c079abfa879049bd33ba5.tar.bz2 | |
Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/Scroller.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 @@ 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; } } |