summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]core/java/android/view/GestureDetector.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/view/GestureDetector.java b/core/java/android/view/GestureDetector.java
index a496a9ea0c8c..5c8b23639ba4 100644..100755
--- a/core/java/android/view/GestureDetector.java
+++ b/core/java/android/view/GestureDetector.java
@@ -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;
+ }
}
/**