am 597fe138: Merge "Remove dependencies on FloatMath"
* commit '597fe13805d12821126a1a1772f2fdcc9d93f1d6':
Remove dependencies on FloatMath
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 3bc58a0..e71cba1 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -27,7 +27,6 @@
import android.hardware.Camera.Parameters;
import android.hardware.Camera.Size;
import android.media.CamcorderProfile;
-import android.util.FloatMath;
import android.util.Log;
import com.android.gallery3d.common.ApiHelper;
@@ -243,8 +242,8 @@
float step = mParameters.getExposureCompensationStep();
// show only integer values for exposure compensation
- int maxValue = (int) FloatMath.floor(max * step);
- int minValue = (int) FloatMath.ceil(min * step);
+ int maxValue = (int) Math.floor(max * step);
+ int minValue = (int) Math.ceil(min * step);
CharSequence entries[] = new CharSequence[maxValue - minValue + 1];
CharSequence entryValues[] = new CharSequence[maxValue - minValue + 1];
int[] icons = new int[maxValue - minValue + 1];
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 2953d6a..163e08a 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -41,7 +41,6 @@
import android.os.ParcelFileDescriptor;
import android.telephony.TelephonyManager;
import android.util.DisplayMetrics;
-import android.util.FloatMath;
import android.util.Log;
import android.util.TypedValue;
import android.view.Display;
@@ -365,7 +364,7 @@
public static float distance(float x, float y, float sx, float sy) {
float dx = x - sx;
float dy = y - sy;
- return FloatMath.sqrt(dx * dx + dy * dy);
+ return (float) Math.hypot(dx, dy);
}
public static int clamp(int x, int min, int max) {
diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index b592508..a424d19 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -554,7 +554,7 @@
res.x = (float) Math.PI / 2;
x = x - mCenter.x;
y = mCenter.y - y;
- res.y = (float) Math.sqrt(x * x + y * y);
+ res.y = (float) Math.hypot(x, y);
if (x != 0) {
res.x = (float) Math.atan2(y, x);
if (res.x < 0) {