Commit 53b603af authored Oct 31, 2014 by Adam Powell Committed by Android Git Automerger Oct 31, 2014

am 987f7168: am d8c941ff: Merge "Don\'t update OverScroller fling state if no...

am 987f7168: am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev automerge: 35261e41

* commit '987f7168':
  Don't update OverScroller fling state if no time has passed since start

parents 7148e911 987f7168

core/java/android/widget/OverScroller.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -901,6 +901,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;
		}