am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath"

* commit '29923a44e65d97b211484f6667c3155bfc396ec9': Remove dependencies on FloatMath
2014-10-15 10:34:37 +00:00
parent 14576ee4b6 29923a44e6
commit b48e878893
5 changed files with 6 additions and 7 deletions
--- 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) {