diff options
| author | Adam Powell <adamp@google.com> | 2010-07-23 15:49:03 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-08-05 15:50:31 -0700 |
| commit | a55191fe8f967cd74c5669447fb9b861c72bbd00 (patch) | |
| tree | a0dc927a31c0b56a0fd9f0bc7da10a7c65263839 | |
| parent | 982f1521a662d274eca1216707d874f148396ac6 (diff) | |
| download | frameworks_base-a55191fe8f967cd74c5669447fb9b861c72bbd00.zip frameworks_base-a55191fe8f967cd74c5669447fb9b861c72bbd00.tar.gz frameworks_base-a55191fe8f967cd74c5669447fb9b861c72bbd00.tar.bz2 | |
DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63
| -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; } } |