Merge "Avoid overflow in focus fudge calculation" am: 795d4a5aa4

am: e842e266a6

Change-Id: I0509b4debdf634075df7d8f63516d0b8e18e4b8c

core/java/android/view/FocusFinder.java

@@ -530,7 +530,7 @@ public class FocusFinder {
      * axis distances.  Warning: this fudge factor is finely tuned, be sure to
      * run all focus tests if you dare tweak it.
      */
-    int getWeightedDistanceFor(int majorAxisDistance, int minorAxisDistance) {
+    long getWeightedDistanceFor(long majorAxisDistance, long minorAxisDistance) {
         return 13 * majorAxisDistance * majorAxisDistance
                 + minorAxisDistance * minorAxisDistance;
     }