diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-02 14:32:37 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-10-02 14:32:37 +0100 |
| commit | c2a0b4482d7144e8382346ea4c22c7b89368fec0 (patch) | |
| tree | f0ec3fbeee8dde1d56ad85c59d858ec093d5eb9d /core/java/android/widget/Scroller.java | |
| parent | f08384c763d2e57c05e0be4325c267d12fc516d4 (diff) | |
| parent | ee665151a4c6359cbfbb9a6795aa9097c4622083 (diff) | |
| download | frameworks_base-c2a0b4482d7144e8382346ea4c22c7b89368fec0.zip frameworks_base-c2a0b4482d7144e8382346ea4c22c7b89368fec0.tar.gz frameworks_base-c2a0b4482d7144e8382346ea4c22c7b89368fec0.tar.bz2 | |
resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
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 5e88a96..357c9c3 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; @@ -425,7 +424,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; @@ -442,7 +441,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); |