Merge "Add asm/a.out.h to arm64/mips/mips64"
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapMesh.java b/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapMesh.java
index 12c79ca..67fd444 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapMesh.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/BitmapMesh.java
@@ -22,7 +22,6 @@
import android.graphics.*;
import android.os.Bundle;
import android.view.*;
-import android.util.FloatMath;
public class BitmapMesh extends GraphicsActivity {
@@ -92,7 +91,7 @@
float dx = cx - x;
float dy = cy - y;
float dd = dx*dx + dy*dy;
- float d = FloatMath.sqrt(dd);
+ float d = (float) Math.sqrt(dd);
float pull = K / (dd + 0.000001f);
pull /= (d + 0.000001f);
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/ColorPickerDialog.java b/samples/ApiDemos/src/com/example/android/apis/graphics/ColorPickerDialog.java
index 1c7125f..75d51bc 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/ColorPickerDialog.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/ColorPickerDialog.java
@@ -167,7 +167,7 @@
public boolean onTouchEvent(MotionEvent event) {
float x = event.getX() - CENTER_X;
float y = event.getY() - CENTER_Y;
- boolean inCenter = java.lang.Math.sqrt(x*x + y*y) <= CENTER_RADIUS;
+ boolean inCenter = java.lang.Math.hypot(x, y) <= CENTER_RADIUS;
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/GameView.java b/samples/ApiDemos/src/com/example/android/apis/view/GameView.java
index d7f039b..48c95b6 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/GameView.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/GameView.java
@@ -483,7 +483,7 @@
}
static float pythag(float x, float y) {
- return (float) Math.sqrt(x * x + y * y);
+ return (float) Math.hypot(x, y);
}
static int blend(float alpha, int from, int to) {
diff --git a/samples/ControllerSample/src/com/example/controllersample/GameView.java b/samples/ControllerSample/src/com/example/controllersample/GameView.java
index 6481a2a..1f5474e 100644
--- a/samples/ControllerSample/src/com/example/controllersample/GameView.java
+++ b/samples/ControllerSample/src/com/example/controllersample/GameView.java
@@ -448,7 +448,7 @@
}
private static float pythag(float x, float y) {
- return (float) Math.sqrt(x * x + y * y);
+ return (float) Math.hypot(x, y);
}
private static int blend(float alpha, int from, int to) {
diff --git a/samples/LunarLander/src/com/example/android/lunarlander/LunarView.java b/samples/LunarLander/src/com/example/android/lunarlander/LunarView.java
index 81e0470..4b82e6b 100644
--- a/samples/LunarLander/src/com/example/android/lunarlander/LunarView.java
+++ b/samples/LunarLander/src/com/example/android/lunarlander/LunarView.java
@@ -634,7 +634,7 @@
canvas.drawRect(mScratchRect, mLinePaint);
// Draw the speed gauge, with a two-tone effect
- double speed = Math.sqrt(mDX * mDX + mDY * mDY);
+ double speed = Math.hypot(mDX, mDY);
int speedWidth = (int) (UI_BAR * speed / PHYS_SPEED_MAX);
if (speed <= mGoalSpeed) {
@@ -756,7 +756,7 @@
int result = STATE_LOSE;
CharSequence message = "";
Resources res = mContext.getResources();
- double speed = Math.sqrt(mDX * mDX + mDY * mDY);
+ double speed = Math.hypot(mDX, mDY);
boolean onGoal = (mGoalX <= mX - mLanderWidth / 2 && mX
+ mLanderWidth / 2 <= mGoalX + mGoalWidth);
