am f1340f18: Merge "Remove dependencies on FloatMath"

* commit 'f1340f1810464ec656262141326c87b3896a3550': Remove dependencies on FloatMath
2014-10-23 22:30:10 +00:00
parent 24082c8a0d f1340f1810
commit 23582d7da0
8 changed files with 15 additions and 24 deletions
@@ -488,8 +488,7 @@ public class DragController {
        checkTouchMove(dropTarget);

        // Check if we are hovering over the scroll areas
-        mDistanceSinceScroll +=
-            Math.sqrt(Math.pow(mLastTouch[0] - x, 2) + Math.pow(mLastTouch[1] - y, 2));
+        mDistanceSinceScroll += Math.hypot(mLastTouch[0] - x, mLastTouch[1] - y);
        mLastTouch[0] = x;
        mLastTouch[1] = y;
        checkScrollState(x, y);