Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8f2a064 authored by Niklas Brunlid's avatar Niklas Brunlid Committed by android-build-merger
Browse files

Merge "Avoid overflow in focus fudge calculation" am: 795d4a5a am: e842e266 

am: 858c934b

Change-Id: I80d027ca4adffbc18b95c365d9ed27d9faaefccd
parents c0c6ee6b 858c934b

core/java/android/view/FocusFinder.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }