diff options
| author | Adam Powell <adamp@google.com> | 2014-10-31 23:42:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 23:42:43 +0000 |
| commit | d8c941ff46a68b91c53b3b1dd26678593787e0f9 (patch) | |
| tree | 6370e724d8645f3962d95a95a7f649e0998c90f6 /core/java/android/widget | |
| parent | 5ef081828181663bc79ea0add6afaa35a93567fb (diff) | |
| parent | 311506afbba83c11b862c1f95a24dea83fab0aad (diff) | |
| download | frameworks_base-d8c941ff46a68b91c53b3b1dd26678593787e0f9.zip frameworks_base-d8c941ff46a68b91c53b3b1dd26678593787e0f9.tar.gz frameworks_base-d8c941ff46a68b91c53b3b1dd26678593787e0f9.tar.bz2 | |
Merge "Don't update OverScroller fling state if no time has passed since start" into lmp-mr1-dev
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/OverScroller.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java index 7b3dd31..a40d4f8 100644 --- a/core/java/android/widget/OverScroller.java +++ b/core/java/android/widget/OverScroller.java @@ -904,6 +904,10 @@ public class OverScroller { final long time = AnimationUtils.currentAnimationTimeMillis(); final long currentTime = time - mStartTime; + if (currentTime == 0) { + // Skip work but report that we're still going if we have a nonzero duration. + return mDuration > 0; + } if (currentTime > mDuration) { return false; } |