diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-09-19 14:59:39 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2017-09-25 09:38:14 +0200 |
commit | e6fea1e726cc2d866a8da652a0100412ad89bafa (patch) | |
tree | 1afb940bc76851d4a01153e98a1f4ec4997d3e4d /platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java | |
parent | 04d7aced4d383a6ee9a5ca815216c5df0e9c10f0 (diff) | |
download | qtlocation-mapboxgl-e6fea1e726cc2d866a8da652a0100412ad89bafa.tar.gz |
[android] - disable rotation gesture when pinch zooming
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java index 71fb9aa168..db492b6556 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java @@ -54,8 +54,7 @@ public abstract class TwoFingerGestureDetector extends BaseGestureDetector { ViewConfiguration config = ViewConfiguration.get(context); - // We divide edge slop by 2 to make rotation gesture happen more easily #6870 - edgeSlop = config.getScaledEdgeSlop() / 2; + edgeSlop = config.getScaledEdgeSlop(); } @Override @@ -222,4 +221,4 @@ public abstract class TwoFingerGestureDetector extends BaseGestureDetector { return focus.y; } -} +}
\ No newline at end of file |