[android] #3535 - improve disabling tracking modes
This commit is contained in:
@@ -3132,16 +3132,6 @@ public final class MapView extends FrameLayout {
|
||||
mZoomButtonsController.setVisible(true);
|
||||
}
|
||||
|
||||
// Disable tracking mode if a gesture occurs
|
||||
try {
|
||||
//noinspection ResourceType
|
||||
setMyLocationTrackingMode(MyLocationTracking.TRACKING_NONE);
|
||||
//noinspection ResourceType
|
||||
setMyBearingTrackingMode(MyBearingTracking.NONE);
|
||||
} catch (SecurityException ignore) {
|
||||
// User did not accept location permissions
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -3294,6 +3284,9 @@ public final class MapView extends FrameLayout {
|
||||
return false;
|
||||
}
|
||||
|
||||
// reset tracking modes if gesture occurs
|
||||
resetTrackingModes();
|
||||
|
||||
// Fling the map
|
||||
float ease = 0.25f;
|
||||
|
||||
@@ -3323,6 +3316,9 @@ public final class MapView extends FrameLayout {
|
||||
return false;
|
||||
}
|
||||
|
||||
// reset tracking modes if gesture occurs
|
||||
resetTrackingModes();
|
||||
|
||||
// Cancel any animation
|
||||
mNativeMapView.cancelTransitions();
|
||||
|
||||
@@ -3350,6 +3346,9 @@ public final class MapView extends FrameLayout {
|
||||
return false;
|
||||
}
|
||||
|
||||
// reset tracking modes if gesture occurs
|
||||
resetTrackingModes();
|
||||
|
||||
mBeginTime = detector.getEventTime();
|
||||
return true;
|
||||
}
|
||||
@@ -3420,6 +3419,9 @@ public final class MapView extends FrameLayout {
|
||||
return false;
|
||||
}
|
||||
|
||||
// reset tracking modes if gesture occurs
|
||||
resetTrackingModes();
|
||||
|
||||
mBeginTime = detector.getEventTime();
|
||||
return true;
|
||||
}
|
||||
@@ -3496,6 +3498,9 @@ public final class MapView extends FrameLayout {
|
||||
return false;
|
||||
}
|
||||
|
||||
// reset tracking modes if gesture occurs
|
||||
resetTrackingModes();
|
||||
|
||||
mBeginTime = detector.getEventTime();
|
||||
return true;
|
||||
}
|
||||
@@ -4212,6 +4217,17 @@ public final class MapView extends FrameLayout {
|
||||
mOnMyBearingTrackingModeChangeListener = listener;
|
||||
}
|
||||
|
||||
private void resetTrackingModes(){
|
||||
try {
|
||||
//noinspection ResourceType
|
||||
setMyLocationTrackingMode(MyLocationTracking.TRACKING_NONE);
|
||||
//noinspection ResourceType
|
||||
setMyBearingTrackingMode(MyBearingTracking.NONE);
|
||||
} catch (SecurityException ignore) {
|
||||
// User did not accept location permissions
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Compass
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user