diff options
author | Antonio Zugaldia <antonio@mapbox.com> | 2015-12-03 14:54:37 -0500 |
---|---|---|
committer | Brad Leege <bleege@gmail.com> | 2015-12-03 16:57:44 -0600 |
commit | 805aae24391a1c1239da5fb11a3f9ce890a4ba5e (patch) | |
tree | 83f77b0ab188ea827fd3769bbe9180ca0550c276 | |
parent | da2dd0929b69488eca4ab64e118236e6958e9683 (diff) | |
download | qtlocation-mapboxgl-805aae24391a1c1239da5fb11a3f9ce890a4ba5e.tar.gz |
[android] #2805 - add mShoveGestureDetector to the event chain
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index d52f667001..75a89cda09 100644 --- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java +++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -2480,6 +2480,7 @@ public final class MapView extends FrameLayout { // Check two finger gestures first mRotateGestureDetector.onTouchEvent(event); mScaleGestureDetector.onTouchEvent(event); + mShoveGestureDetector.onTouchEvent(event); // Handle two finger tap switch (event.getActionMasked()) { @@ -2501,7 +2502,9 @@ public final class MapView extends FrameLayout { // First pointer up long tapInterval = event.getEventTime() - event.getDownTime(); boolean isTap = tapInterval <= ViewConfiguration.getTapTimeout(); - boolean inProgress = mRotateGestureDetector.isInProgress() || mScaleGestureDetector.isInProgress(); + boolean inProgress = mRotateGestureDetector.isInProgress() + || mScaleGestureDetector.isInProgress() + || mShoveGestureDetector.isInProgress(); if (mTwoTap && isTap && !inProgress) { PointF focalPoint = TwoFingerGestureDetector.determineFocalPoint(event); |