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

Commit 9f207a85 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem" 

* commit 'aff90790':
  The bigger touch slop still has a problem
parents 46074f4d aff90790

core/java/android/view/GestureDetector.java

100644 → 100755
+9 −2
Original line number Diff line number Diff line
@@ -193,8 +193,7 @@ public class GestureDetector { 
        }

    }



    // TODO: ViewConfiguration

    private int mBiggerTouchSlopSquare = 20 * 20;

    private int mBiggerTouchSlopSquare;



    private int mTouchSlopSquare;

    private int mDoubleTapSlopSquare;
@@ -408,6 +407,14 @@ public class GestureDetector { 
        }

        mTouchSlopSquare = touchSlop * touchSlop;

        mDoubleTapSlopSquare = doubleTapSlop * doubleTapSlop;



        // The biggerTouchSlop should be a little bit bigger than touchSlop

        // and mBiggerTouchSlopSquare should not be over mDoubleTapSlopSquare.

        int biggerTouchSlop = (int)(touchSlop * 1.25f);

        mBiggerTouchSlopSquare = biggerTouchSlop * biggerTouchSlop;

        if (mBiggerTouchSlopSquare > mDoubleTapSlopSquare) {

            mBiggerTouchSlopSquare = mDoubleTapSlopSquare;

        }

    }



    /**