[android] do not reset custom location gestures manager if already set
This commit is contained in:
committed by
Łukasz Paczos
parent
3e106c3f56
commit
1aa44d5451
@@ -77,9 +77,11 @@ final class LocationCameraController {
|
||||
void initializeOptions(LocationComponentOptions options) {
|
||||
this.options = options;
|
||||
if (options.trackingGesturesManagement()) {
|
||||
mapboxMap.setGesturesManager(internalGesturesManager, true, true);
|
||||
if (mapboxMap.getGesturesManager() != internalGesturesManager) {
|
||||
mapboxMap.setGesturesManager(internalGesturesManager, true, true);
|
||||
}
|
||||
adjustGesturesThresholds();
|
||||
} else {
|
||||
} else if (mapboxMap.getGesturesManager() != initialGesturesManager) {
|
||||
mapboxMap.setGesturesManager(initialGesturesManager, true, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -408,6 +408,7 @@ public class LocationCameraControllerTest {
|
||||
MapboxMap mapboxMap = mock(MapboxMap.class);
|
||||
AndroidGesturesManager initialGesturesManager = mock(AndroidGesturesManager.class);
|
||||
AndroidGesturesManager internalGesturesManager = mock(AndroidGesturesManager.class);
|
||||
when(mapboxMap.getGesturesManager()).thenReturn(initialGesturesManager);
|
||||
LocationCameraController camera = buildCamera(mapboxMap, initialGesturesManager, internalGesturesManager);
|
||||
LocationComponentOptions options = mock(LocationComponentOptions.class);
|
||||
when(options.trackingGesturesManagement()).thenReturn(true);
|
||||
@@ -421,6 +422,7 @@ public class LocationCameraControllerTest {
|
||||
MapboxMap mapboxMap = mock(MapboxMap.class);
|
||||
AndroidGesturesManager initialGesturesManager = mock(AndroidGesturesManager.class);
|
||||
AndroidGesturesManager internalGesturesManager = mock(AndroidGesturesManager.class);
|
||||
when(mapboxMap.getGesturesManager()).thenReturn(internalGesturesManager);
|
||||
LocationCameraController camera = buildCamera(mapboxMap, initialGesturesManager, internalGesturesManager);
|
||||
LocationComponentOptions options = mock(LocationComponentOptions.class);
|
||||
when(options.trackingGesturesManagement()).thenReturn(false);
|
||||
@@ -429,6 +431,34 @@ public class LocationCameraControllerTest {
|
||||
verify(mapboxMap).setGesturesManager(initialGesturesManager, true, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void gesturesManagement_optionNotChangedInitial() {
|
||||
MapboxMap mapboxMap = mock(MapboxMap.class);
|
||||
AndroidGesturesManager initialGesturesManager = mock(AndroidGesturesManager.class);
|
||||
AndroidGesturesManager internalGesturesManager = mock(AndroidGesturesManager.class);
|
||||
when(mapboxMap.getGesturesManager()).thenReturn(initialGesturesManager);
|
||||
LocationCameraController camera = buildCamera(mapboxMap, initialGesturesManager, internalGesturesManager);
|
||||
LocationComponentOptions options = mock(LocationComponentOptions.class);
|
||||
when(options.trackingGesturesManagement()).thenReturn(false);
|
||||
camera.initializeOptions(options);
|
||||
|
||||
verify(mapboxMap, times(0)).setGesturesManager(initialGesturesManager, true, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void gesturesManagement_optionNotChangedInternal() {
|
||||
MapboxMap mapboxMap = mock(MapboxMap.class);
|
||||
AndroidGesturesManager initialGesturesManager = mock(AndroidGesturesManager.class);
|
||||
AndroidGesturesManager internalGesturesManager = mock(AndroidGesturesManager.class);
|
||||
when(mapboxMap.getGesturesManager()).thenReturn(internalGesturesManager);
|
||||
LocationCameraController camera = buildCamera(mapboxMap, initialGesturesManager, internalGesturesManager);
|
||||
LocationComponentOptions options = mock(LocationComponentOptions.class);
|
||||
when(options.trackingGesturesManagement()).thenReturn(true);
|
||||
camera.initializeOptions(options);
|
||||
|
||||
verify(mapboxMap, times(0)).setGesturesManager(internalGesturesManager, true, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onMove_notCancellingTransitionWhileNone() {
|
||||
MapboxMap mapboxMap = mock(MapboxMap.class);
|
||||
|
||||
Reference in New Issue
Block a user