diff options
| author | Adam Powell <adamp@google.com> | 2010-07-28 17:01:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 17:01:35 -0700 |
| commit | 589f15556badf0c7c6a046ce433025ab86236c7b (patch) | |
| tree | 9f4bcdebc577187539e94fabed73231a75413e32 /core | |
| parent | 48555f8f09c87224e312554b6b771ee30da6a435 (diff) | |
| parent | c6d83cafed6e60223c28da328f845998e27bfae0 (diff) | |
| download | frameworks_base-589f15556badf0c7c6a046ce433025ab86236c7b.zip frameworks_base-589f15556badf0c7c6a046ce433025ab86236c7b.tar.gz frameworks_base-589f15556badf0c7c6a046ce433025ab86236c7b.tar.bz2 | |
am c6d83caf: am a0ae8bc5: Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Merge commit 'c6d83cafed6e60223c28da328f845998e27bfae0'
* commit 'c6d83cafed6e60223c28da328f845998e27bfae0':
Fix a bug that could cause flings to last too long using a Scroller
Diffstat (limited to 'core')
| -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; } } |