diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-02 10:14:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-02 10:14:19 +0000 |
| commit | 0c1faf43aecadc37b78c4ad6cb669eb351d21385 (patch) | |
| tree | 86aed0f37ba91b3b137978b412889b2057a4898e /core/java/android/widget/Scroller.java | |
| parent | 316296511bf12c4e14dfb6f54731d1a515114abf (diff) | |
| parent | 33253a4baa6279f81a73425b49dfb6abe5f5416e (diff) | |
| download | frameworks_base-0c1faf43aecadc37b78c4ad6cb669eb351d21385.zip frameworks_base-0c1faf43aecadc37b78c4ad6cb669eb351d21385.tar.gz frameworks_base-0c1faf43aecadc37b78c4ad6cb669eb351d21385.tar.bz2 | |
Merge "Switch from FloatMath -> Math and Math.hypot where possible"
Diffstat (limited to 'core/java/android/widget/Scroller.java')
| -rw-r--r-- | core/java/android/widget/Scroller.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/widget/Scroller.java b/core/java/android/widget/Scroller.java index 3bfd39d..760e05c 100644 --- a/core/java/android/widget/Scroller.java +++ b/core/java/android/widget/Scroller.java @@ -19,7 +19,6 @@ package android.widget; import android.content.Context; import android.hardware.SensorManager; import android.os.Build; -import android.util.FloatMath; import android.view.ViewConfiguration; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; @@ -436,7 +435,7 @@ public class Scroller { float dx = (float) (mFinalX - mStartX); float dy = (float) (mFinalY - mStartY); - float hyp = FloatMath.sqrt(dx * dx + dy * dy); + float hyp = (float) Math.hypot(dx, dy); float ndx = dx / hyp; float ndy = dy / hyp; @@ -453,7 +452,7 @@ public class Scroller { mMode = FLING_MODE; mFinished = false; - float velocity = FloatMath.sqrt(velocityX * velocityX + velocityY * velocityY); + float velocity = (float) Math.hypot(velocityX, velocityY); mVelocity = velocity; mDuration = getSplineFlingDuration(velocity); |