From dd4697d3166a8a3d89afd9012b44c2396bd9552c Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Thu, 2 Oct 2014 15:19:08 +0100
Subject: [PATCH] Remove dependencies on FloatMath

See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I01126788f34b9a464b873bc2fff03acedc43bb52
---
 .../src/com/example/android/apis/graphics/BitmapMesh.java     | 3 +--
 .../com/example/android/apis/graphics/ColorPickerDialog.java  | 2 +-
 .../ApiDemos/src/com/example/android/apis/view/GameView.java  | 2 +-
 .../src/com/example/controllersample/GameView.java            | 2 +-
 .../src/com/example/android/lunarlander/LunarView.java        | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

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 12c79ca54..67fd44480 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.content.Context;
 import android.graphics.*;
 import android.os.Bundle;
 import android.view.*;
-import android.util.FloatMath;
 
 public class BitmapMesh extends GraphicsActivity {
 
@@ -92,7 +91,7 @@ public class BitmapMesh extends GraphicsActivity {
                 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 1c7125f9d..75d51bcac 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 class ColorPickerDialog extends Dialog {
         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 d7f039bdd..48c95b680 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 @@ public class GameView extends View {
     }
 
     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 6481a2a39..1f5474eba 100644
--- a/samples/ControllerSample/src/com/example/controllersample/GameView.java
+++ b/samples/ControllerSample/src/com/example/controllersample/GameView.java
@@ -448,7 +448,7 @@ public class GameView extends View implements InputDeviceListener {
     }
 
     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 81e047084..4b82e6b13 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 @@ class LunarView extends SurfaceView implements SurfaceHolder.Callback {
             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 @@ class LunarView extends SurfaceView implements SurfaceHolder.Callback {
                 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);