tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] ensure to re-enable move when quickzoom finishes

Browse Source 
Because the double tap event can be canceled and stop delivering events whenever ACTION_CANCEL or ACTION_POINTER_DOWN is dispatched, we need to make the #onScaleEnd callback responsible for re-enabling the move detector as well
This commit is contained in:
Łukasz Paczos
2019-06-19 18:29:16 +02:00
committed by Łukasz Paczos
parent 3d6da49073
commit 577e03f949
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
View File

@@ -344,8 +344,10 @@ final class MapGestureDetector {
}
if (motionEvent.getActionMasked() == MotionEvent.ACTION_UP) {
// re-enabled the move detector
gesturesManager.getMoveGestureDetector().setEnabled(true);
if (executeDoubleTap) {
// re-enable the move detector only if we did not start the quickzoom, otherwise, re-enable in the #onScaleEnd
gesturesManager.getMoveGestureDetector().setEnabled(true);
}
if (!uiSettings.isZoomGesturesEnabled() || !uiSettings.isDoubleTapGesturesEnabled() || !executeDoubleTap) {
return false;
@@ -512,6 +514,13 @@ final class MapGestureDetector {
@Override
public void onScaleEnd(@NonNull StandardScaleGestureDetector detector, float velocityX, float velocityY) {
if (quickZoom) {
// re-enabled the move detector only if the quickzoom happened
// we need to split the responsibility of re-enabling the move detector,
// because the double tap event (where the detector is disabled) can be canceled without warning (see #14598)
gesturesManager.getMoveGestureDetector().setEnabled(true);
}
if (uiSettings.isIncreaseRotateThresholdWhenScaling()) {
// resetting default angle threshold
gesturesManager.getRotateGestureDetector().setAngleThreshold(