diff options
| author | Neil Fuller <nfuller@google.com> | 2015-04-15 09:27:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-15 09:27:46 +0000 |
| commit | deb3dd3ef824d9a46467b55cda3d7448268a1488 (patch) | |
| tree | 0320db9a69afde75db19e55315c8975e29254f1a | |
| parent | 4a9c2e78a527801788212c7eae7bd1688dafa19c (diff) | |
| parent | ba41458f5c696194d547ac8f24e9f8e58cfa64fc (diff) | |
| download | android_packages_apps_Trebuchet-deb3dd3ef824d9a46467b55cda3d7448268a1488.tar.gz android_packages_apps_Trebuchet-deb3dd3ef824d9a46467b55cda3d7448268a1488.tar.bz2 android_packages_apps_Trebuchet-deb3dd3ef824d9a46467b55cda3d7448268a1488.zip | |
am ba41458f: Remove usage of FloatMath
* commit 'ba41458f5c696194d547ac8f24e9f8e58cfa64fc':
Remove usage of FloatMath
| -rw-r--r-- | WallpaperPicker/src/com/android/launcher3/CropView.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherScroller.java | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/CropView.java b/WallpaperPicker/src/com/android/launcher3/CropView.java index 578b8eafd..50f779add 100644 --- a/WallpaperPicker/src/com/android/launcher3/CropView.java +++ b/WallpaperPicker/src/com/android/launcher3/CropView.java @@ -21,7 +21,6 @@ import android.graphics.Matrix; import android.graphics.Point; import android.graphics.RectF; import android.util.AttributeSet; -import android.util.FloatMath; import android.view.MotionEvent; import android.view.ScaleGestureDetector; import android.view.ScaleGestureDetector.OnScaleGestureListener; @@ -300,12 +299,12 @@ public class CropView extends TiledImageView implements OnScaleGestureListener { adjustment[0] = (edges.right - getWidth()) / scale; } if (edges.top > 0) { - adjustment[1] = FloatMath.ceil(edges.top / scale); + adjustment[1] = (float) Math.ceil(edges.top / scale); } else if (edges.bottom < getHeight()) { adjustment[1] = (edges.bottom - getHeight()) / scale; } for (int dim = 0; dim <= 1; dim++) { - if (coef[dim] > 0) adjustment[dim] = FloatMath.ceil(adjustment[dim]); + if (coef[dim] > 0) adjustment[dim] = (float) Math.ceil(adjustment[dim]); } mInverseRotateMatrix.mapPoints(adjustment); diff --git a/src/com/android/launcher3/LauncherScroller.java b/src/com/android/launcher3/LauncherScroller.java index 3bd0a78c4..a9b49556b 100644 --- a/src/com/android/launcher3/LauncherScroller.java +++ b/src/com/android/launcher3/LauncherScroller.java @@ -20,7 +20,6 @@ import android.animation.TimeInterpolator; 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; @@ -409,7 +408,7 @@ public class LauncherScroller { 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; @@ -426,7 +425,7 @@ public class LauncherScroller { 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); |