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

* commit 'aff90790dff94eb9a4bed541eff4f106623afd09':
  The bigger touch slop still has a problem

Author: Jean-Baptiste Queru

core/java/android/view/GestureDetector.java

@@ -193,8 +193,7 @@ public boolean onSingleTapConfirmed(MotionEvent e) {
         }
     }
 
-    // TODO: ViewConfiguration
-    private int mBiggerTouchSlopSquare = 20 * 20;
+    private int mBiggerTouchSlopSquare;
 
     private int mTouchSlopSquare;
     private int mDoubleTapSlopSquare;
@@ -408,6 +407,14 @@ private void init(Context context, boolean ignoreMultitouch) {
         }
         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;
+        }
     }
 
     /**