diff options
| author | Tim Murray <timmurray@google.com> | 2017-12-19 12:56:12 -0800 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2017-12-19 12:56:12 -0800 |
| commit | fa83834a44052fb9bbdaa81e0faea6870e71268d (patch) | |
| tree | ff9cd6a245e72080f5c75ee5d0d839ff9bd8a2c5 /core/java/android/widget/TextView.java | |
| parent | 53b2d749240f8c689b04155a960b75c40c00aba8 (diff) | |
Avoid unnecessary division in TextView.Marquee.tick.
Test: Marquee.tick works
Change-Id: Idb2c1cadb6b49009f8bec45ad44a34f5636c0e79
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 9ac443b43701..1564aae818e9 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -11879,7 +11879,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private final Choreographer mChoreographer; private byte mStatus = MARQUEE_STOPPED; - private final float mPixelsPerSecond; + private final float mPixelsPerMs; private float mMaxScroll; private float mMaxFadeScroll; private float mGhostStart; @@ -11892,7 +11892,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener Marquee(TextView v) { final float density = v.getContext().getResources().getDisplayMetrics().density; - mPixelsPerSecond = MARQUEE_DP_PER_SECOND * density; + mPixelsPerMs = MARQUEE_DP_PER_SECOND * density / 1000f; mView = new WeakReference<TextView>(v); mChoreographer = Choreographer.getInstance(); } @@ -11937,7 +11937,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener long currentMs = mChoreographer.getFrameTime(); long deltaMs = currentMs - mLastAnimationMs; mLastAnimationMs = currentMs; - float deltaPx = deltaMs / 1000f * mPixelsPerSecond; + float deltaPx = deltaMs * mPixelsPerMs; mScroll += deltaPx; if (mScroll > mMaxScroll) { mScroll = mMaxScroll; |
