diff options
| author | Langston Smith <langston.smith@mapbox.com> | 2018-01-04 11:15:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 11:15:50 -0800 |
| commit | 2ea955d2751ba6459f99a0695e53505c0a11702b (patch) | |
| tree | f54450918b634a2eea1bd2c4ebc671bf1bb06106 /platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors | |
| parent | f2ec6ae326bad79fea2b06a21151a2835522572a (diff) | |
| parent | c62b0af24fc76b4bb2eb34100611dd3ee9ee5536 (diff) | |
| download | qtlocation-mapboxgl-2ea955d2751ba6459f99a0695e53505c0a11702b.tar.gz | |
Merge branch 'master' into ls-android-readme-tweaksupstream/ls-android-readme-tweaks
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors')
| -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 |