commit | c66727ebf001607cee14521c35bc852b55fd9845 | [log] [tgz] |
---|---|---|
author | Neil Fuller <nfuller@google.com> | Wed Feb 11 21:33:37 2015 +0000 |
committer | Neil Fuller <nfuller@google.com> | Mon Apr 13 14:21:22 2015 +0100 |
tree | 67a59142dd6ac033749ab8628209b4473388c621 | |
parent | b8181a2726c91a81b2fce55cecc1f209635497ae [diff] |
Remove usage of FloatMath This is the same as upstream pull request: https://bitbucket.org/androidplot/androidplot/pull-request/50 Change-Id: I32064625ac7e2bc5766c95e7fdfb8ad7d18b2864
diff --git a/Examples/DemoApp/src/com/androidplot/demos/TouchZoomExampleActivity.java b/Examples/DemoApp/src/com/androidplot/demos/TouchZoomExampleActivity.java index 65c5c71..b7c5a8a 100644 --- a/Examples/DemoApp/src/com/androidplot/demos/TouchZoomExampleActivity.java +++ b/Examples/DemoApp/src/com/androidplot/demos/TouchZoomExampleActivity.java
@@ -24,7 +24,6 @@ import android.graphics.Paint; import android.graphics.PointF; import android.os.Bundle; -import android.util.FloatMath; import android.view.MotionEvent; import android.view.View; import android.view.View.OnTouchListener; @@ -202,7 +201,7 @@ private float spacing(MotionEvent event) { float x = event.getX(0) - event.getX(1); float y = event.getY(0) - event.getY(1); - return FloatMath.sqrt(x * x + y * y); + return (float) Math.hypot(x, y); } }