summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2018-10-25 15:35:43 +0200
committerTobrun <tobrun@mapbox.com>2018-10-31 14:53:56 +0100
commit11f00c439374238901b1992a940c98ecd59880bf (patch)
treed93360f1d9226940ecbfa91e983c2fa1de9febfb /platform
parentf236cc6163826b4072da8e00c8d4821175144ca4 (diff)
downloadqtlocation-mapboxgl-11f00c439374238901b1992a940c98ecd59880bf.tar.gz
[android] removed ZoomButtonsController support
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java1
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java105
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapZoomButtonController.java35
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java32
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java49
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml3
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml3
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java9
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java12
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java1
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java3
11 files changed, 4 insertions, 249 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
index 640c70282c..afd25f13fc 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
@@ -124,7 +124,6 @@ public class MapboxConstants {
public static final String STATE_SCROLL_ENABLED = "mapbox_scrollEnabled";
public static final String STATE_ROTATE_ENABLED = "mapbox_rotateEnabled";
public static final String STATE_TILT_ENABLED = "mapbox_tiltEnabled";
- public static final String STATE_ZOOM_CONTROLS_ENABLED = "mapbox_zoomControlsEnabled";
public static final String STATE_DOUBLE_TAP_ENABLED = "mapbox_doubleTapEnabled";
public static final String STATE_DEBUG_ACTIVE = "mapbox_debugActive";
public static final String STATE_STYLE_URL = "mapbox_styleUrl";
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index b8edbc479e..4b6e0a03af 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -21,7 +21,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
-import android.widget.ZoomButtonsController;
import com.mapbox.android.gestures.AndroidGesturesManager;
import com.mapbox.mapboxsdk.MapStrictMode;
@@ -94,7 +93,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
private MapGestureDetector mapGestureDetector;
private MapKeyListener mapKeyListener;
- private MapZoomButtonController mapZoomButtonController;
private Bundle savedInstanceState;
@UiThread
@@ -184,12 +182,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
annotationManager, cameraChangeDispatcher);
mapKeyListener = new MapKeyListener(transform, uiSettings, mapGestureDetector);
- // overlain zoom buttons
- mapZoomButtonController = new MapZoomButtonController(new ZoomButtonsController(this));
- MapZoomControllerListener zoomListener = new MapZoomControllerListener(
- mapGestureDetector, cameraChangeDispatcher, getWidth(), getHeight());
- mapZoomButtonController.bind(uiSettings, zoomListener);
-
// compass
compassView.injectCompassAnimationListener(createCompassAnimationListener(cameraChangeDispatcher));
compassView.setOnClickListener(createCompassClickListener(cameraChangeDispatcher));
@@ -449,13 +441,10 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
@Override
public boolean onTouchEvent(MotionEvent event) {
- if (!isZoomButtonControllerInitialized() || !isGestureDetectorInitialized()) {
+ if (!isGestureDetectorInitialized()) {
return super.onTouchEvent(event);
}
- if (event.getAction() == MotionEvent.ACTION_DOWN) {
- mapZoomButtonController.setVisible(true);
- }
return mapGestureDetector.onTouchEvent(event) || super.onTouchEvent(event);
}
@@ -487,28 +476,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
return mapGestureDetector.onGenericMotionEvent(event) || super.onGenericMotionEvent(event);
}
- @Override
- public boolean onHoverEvent(MotionEvent event) {
- if (!isZoomButtonControllerInitialized()) {
- return super.onHoverEvent(event);
- }
-
- switch (event.getActionMasked()) {
- case MotionEvent.ACTION_HOVER_ENTER:
- case MotionEvent.ACTION_HOVER_MOVE:
- mapZoomButtonController.setVisible(true);
- return true;
-
- case MotionEvent.ACTION_HOVER_EXIT:
- mapZoomButtonController.setVisible(false);
- return true;
-
- default:
- // We are not interested in this event
- return false;
- }
- }
-
/**
* You must call this method from the parent's Activity#onLowMemory() or Fragment#onLowMemory().
*/
@@ -622,32 +589,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
}
//
- // View events
- //
-
- // Called when view is no longer connected
- @Override
- @CallSuper
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
- if (isZoomButtonControllerInitialized()) {
- mapZoomButtonController.setVisible(false);
- }
- }
-
- // Called when view is hidden and shown
- @Override
- protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
- if (isInEditMode()) {
- return;
- }
-
- if (isZoomButtonControllerInitialized()) {
- mapZoomButtonController.setVisible(visibility == View.VISIBLE);
- }
- }
-
- //
// ViewCallback
//
@@ -1078,10 +1019,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
}
}
- private boolean isZoomButtonControllerInitialized() {
- return mapZoomButtonController != null;
- }
-
private boolean isGestureDetectorInitialized() {
return mapGestureDetector != null;
}
@@ -1508,46 +1445,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
}
}
- private static class MapZoomControllerListener implements ZoomButtonsController.OnZoomListener {
-
- private final MapGestureDetector mapGestureDetector;
- private final CameraChangeDispatcher cameraChangeDispatcher;
- private final float mapWidth;
- private final float mapHeight;
-
- MapZoomControllerListener(MapGestureDetector detector, CameraChangeDispatcher dispatcher,
- float mapWidth, float mapHeight) {
- this.mapGestureDetector = detector;
- this.cameraChangeDispatcher = dispatcher;
- this.mapWidth = mapWidth;
- this.mapHeight = mapHeight;
- }
-
- // Not used
- @Override
- public void onVisibilityChanged(boolean visible) {
- // Ignore
- }
-
- // Called when user pushes a zoom button on the ZoomButtonController
- @Override
- public void onZoom(boolean zoomIn) {
- cameraChangeDispatcher.onCameraMoveStarted(CameraChangeDispatcher.REASON_API_ANIMATION);
- onZoom(zoomIn, mapGestureDetector.getFocalPoint());
- }
-
- private void onZoom(boolean zoomIn, @Nullable PointF focalPoint) {
- if (focalPoint == null) {
- focalPoint = new PointF(mapWidth / 2, mapHeight / 2);
- }
- if (zoomIn) {
- mapGestureDetector.zoomInAnimated(focalPoint, true);
- } else {
- mapGestureDetector.zoomOutAnimated(focalPoint, true);
- }
- }
- }
-
private class MapCallback implements OnWillStartLoadingMapListener, OnDidFinishLoadingStyleListener,
OnDidFinishRenderingFrameListener, OnDidFinishLoadingMapListener,
OnCameraIsChangingListener, OnCameraDidChangeListener {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapZoomButtonController.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapZoomButtonController.java
deleted file mode 100644
index 018c8eb5bb..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapZoomButtonController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.mapbox.mapboxsdk.maps;
-
-import android.support.annotation.NonNull;
-import android.widget.ZoomButtonsController;
-
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
-
-/**
- * The MapZoomButtonController is a ui interface element shown on top of the map.
- * <p>
- * Allows single touch only devices to zoom in and out.
- * </p>
- */
-final class MapZoomButtonController {
-
- private UiSettings uiSettings;
- private ZoomButtonsController zoomButtonsController;
-
- MapZoomButtonController(@NonNull ZoomButtonsController zoomButtonsController) {
- this.zoomButtonsController = zoomButtonsController;
- this.zoomButtonsController.setZoomSpeed(MapboxConstants.ANIMATION_DURATION);
- }
-
- void bind(UiSettings uiSettings, ZoomButtonsController.OnZoomListener onZoomListener) {
- this.uiSettings = uiSettings;
- zoomButtonsController.setOnZoomListener(onZoomListener);
- }
-
- void setVisible(boolean visible) {
- if (uiSettings != null && !uiSettings.isZoomControlsEnabled()) {
- return;
- }
- zoomButtonsController.setVisible(visible);
- }
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
index 06f714c1f8..eb745fdec5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
@@ -63,7 +63,6 @@ public class MapboxMapOptions implements Parcelable {
private boolean scrollGesturesEnabled = true;
private boolean tiltGesturesEnabled = true;
private boolean zoomGesturesEnabled = true;
- private boolean zoomControlsEnabled = false;
private boolean doubleTapGesturesEnabled = true;
private boolean prefetchesTiles = true;
@@ -120,7 +119,6 @@ public class MapboxMapOptions implements Parcelable {
rotateGesturesEnabled = in.readByte() != 0;
scrollGesturesEnabled = in.readByte() != 0;
tiltGesturesEnabled = in.readByte() != 0;
- zoomControlsEnabled = in.readByte() != 0;
zoomGesturesEnabled = in.readByte() != 0;
doubleTapGesturesEnabled = in.readByte() != 0;
@@ -162,8 +160,6 @@ public class MapboxMapOptions implements Parcelable {
typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiRotateGestures, true));
mapboxMapOptions.tiltGesturesEnabled(
typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiTiltGestures, true));
- mapboxMapOptions.zoomControlsEnabled(
- typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiZoomControls, false));
mapboxMapOptions.doubleTapGesturesEnabled(
typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiDoubleTapGestures, true));
@@ -494,20 +490,6 @@ public class MapboxMapOptions implements Parcelable {
}
/**
- * Specifies if the zoom controls are enabled for a map view.
- *
- * @param enabled True and gesture will be enabled
- * @return This
- * @deprecated {@link android.widget.ZoomButtonsController}, this functionality and UI is better handled with
- * custom views and layouts rather than a dedicated zoom-control widget.
- */
- @Deprecated
- public MapboxMapOptions zoomControlsEnabled(boolean enabled) {
- zoomControlsEnabled = enabled;
- return this;
- }
-
- /**
* Specifies if the zoom gesture is enabled for a map view.
*
* @param enabled True and gesture will be enabled
@@ -808,15 +790,6 @@ public class MapboxMapOptions implements Parcelable {
}
/**
- * Get the current configured zoom controls state for a map view.
- *
- * @return True indicates gesture is enabled
- */
- public boolean getZoomControlsEnabled() {
- return zoomControlsEnabled;
- }
-
- /**
* Get the current configured zoom gesture state for a map view.
*
* @return True indicates gesture is enabled
@@ -964,7 +937,6 @@ public class MapboxMapOptions implements Parcelable {
dest.writeByte((byte) (rotateGesturesEnabled ? 1 : 0));
dest.writeByte((byte) (scrollGesturesEnabled ? 1 : 0));
dest.writeByte((byte) (tiltGesturesEnabled ? 1 : 0));
- dest.writeByte((byte) (zoomControlsEnabled ? 1 : 0));
dest.writeByte((byte) (zoomGesturesEnabled ? 1 : 0));
dest.writeByte((byte) (doubleTapGesturesEnabled ? 1 : 0));
@@ -1042,9 +1014,6 @@ public class MapboxMapOptions implements Parcelable {
if (zoomGesturesEnabled != options.zoomGesturesEnabled) {
return false;
}
- if (zoomControlsEnabled != options.zoomControlsEnabled) {
- return false;
- }
if (doubleTapGesturesEnabled != options.doubleTapGesturesEnabled) {
return false;
}
@@ -1117,7 +1086,6 @@ public class MapboxMapOptions implements Parcelable {
result = 31 * result + (scrollGesturesEnabled ? 1 : 0);
result = 31 * result + (tiltGesturesEnabled ? 1 : 0);
result = 31 * result + (zoomGesturesEnabled ? 1 : 0);
- result = 31 * result + (zoomControlsEnabled ? 1 : 0);
result = 31 * result + (doubleTapGesturesEnabled ? 1 : 0);
result = 31 * result + (apiBaseUrl != null ? apiBaseUrl.hashCode() : 0);
result = 31 * result + (textureMode ? 1 : 0);
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
index 600402db03..8bc8a412f3 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java
@@ -1,7 +1,6 @@
package com.mapbox.mapboxsdk.maps;
import android.content.Context;
-import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.PointF;
@@ -52,8 +51,6 @@ public final class UiSettings {
private boolean scrollGesturesEnabled = true;
- private boolean zoomControlsEnabled;
-
private boolean doubleTapGesturesEnabled = true;
private boolean scaleVelocityAnimationEnabled = true;
@@ -84,7 +81,6 @@ public final class UiSettings {
initialiseCompass(options, resources);
initialiseLogo(options, resources);
initialiseAttribution(context, options);
- initialiseZoomControl(context);
}
void onSaveInstanceState(Bundle outState) {
@@ -92,7 +88,6 @@ public final class UiSettings {
saveCompass(outState);
saveLogo(outState);
saveAttribution(outState);
- saveZoomControl(outState);
saveDeselectMarkersOnTap(outState);
saveFocalPoint(outState);
}
@@ -102,7 +97,6 @@ public final class UiSettings {
restoreCompass(savedInstanceState);
restoreLogo(savedInstanceState);
restoreAttribution(savedInstanceState);
- restoreZoomControl(savedInstanceState);
restoreDeselectMarkersOnTap(savedInstanceState);
restoreFocalPoint(savedInstanceState);
}
@@ -112,7 +106,6 @@ public final class UiSettings {
setScrollGesturesEnabled(options.getScrollGesturesEnabled());
setRotateGesturesEnabled(options.getRotateGesturesEnabled());
setTiltGesturesEnabled(options.getTiltGesturesEnabled());
- setZoomControlsEnabled(options.getZoomControlsEnabled());
setDoubleTapGesturesEnabled(options.getDoubleTapGesturesEnabled());
}
@@ -259,20 +252,6 @@ public final class UiSettings {
savedInstanceState.getInt(MapboxConstants.STATE_ATTRIBUTION_MARGIN_BOTTOM));
}
- private void initialiseZoomControl(Context context) {
- if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH)) {
- setZoomControlsEnabled(true);
- }
- }
-
- private void saveZoomControl(Bundle outState) {
- outState.putBoolean(MapboxConstants.STATE_ZOOM_CONTROLS_ENABLED, isZoomControlsEnabled());
- }
-
- private void restoreZoomControl(Bundle savedInstanceState) {
- setZoomControlsEnabled(savedInstanceState.getBoolean(MapboxConstants.STATE_ZOOM_CONTROLS_ENABLED));
- }
-
/**
* <p>
* Enables or disables the compass. The compass is an icon on the map that indicates the
@@ -722,34 +701,6 @@ public final class UiSettings {
/**
* <p>
- * Sets whether the zoom controls are enabled.
- * If enabled, the zoom controls are a pair of buttons
- * (one for zooming in, one for zooming out) that appear on the screen.
- * When pressed, they cause the camera to zoom in (or out) by one zoom level.
- * If disabled, the zoom controls are not shown.
- * </p>
- * By default the zoom controls are enabled if the device is only single touch capable;
- *
- * @param zoomControlsEnabled If true, the zoom controls are enabled.
- * @deprecated {@link android.widget.ZoomButtonsController}, this functionality and UI is better handled with
- * custom views and layouts rather than a dedicated zoom-control widget.
- */
- @Deprecated
- public void setZoomControlsEnabled(boolean zoomControlsEnabled) {
- this.zoomControlsEnabled = zoomControlsEnabled;
- }
-
- /**
- * Gets whether the zoom controls are enabled.
- *
- * @return If true, the zoom controls are enabled.
- */
- public boolean isZoomControlsEnabled() {
- return zoomControlsEnabled;
- }
-
- /**
- * <p>
* Changes whether the user may zoom the map with a double tap.
* </p>
* <p>
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
index 730ab580d0..715549bfe2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
@@ -34,9 +34,6 @@
<public name="mapbox_uiTiltGestures" type="attr" />
<public name="mapbox_uiDoubleTapGestures" type="attr" />
- <!--UI-Controls-->
- <public name="mapbox_uiZoomControls" type="attr" />
-
<!--Compass-->
<public name="mapbox_uiCompass" type="attr" />
<public name="mapbox_uiCompassGravity" type="attr" />
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
index 9f0ca86a86..c1044b2830 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
@@ -27,9 +27,6 @@
<attr name="mapbox_uiTiltGestures" format="boolean"/>
<attr name="mapbox_uiDoubleTapGestures" format="boolean"/>
- <!--UI-Controls-->
- <attr name="mapbox_uiZoomControls" format="boolean"/>
-
<!--Compass-->
<attr name="mapbox_uiCompass" format="boolean"/>
<attr name="mapbox_uiCompassGravity">
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java
index 2d2b9d8a7e..64edb885c3 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java
@@ -2,10 +2,12 @@ package com.mapbox.mapboxsdk.maps;
import android.graphics.Color;
import android.view.Gravity;
+
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.constants.Style;
import com.mapbox.mapboxsdk.geometry.LatLng;
+
import org.junit.Test;
import java.util.Arrays;
@@ -145,13 +147,6 @@ public class MapboxMapOptionsTest {
}
@Test
- public void testZoomControlsEnabled() {
- assertFalse(new MapboxMapOptions().getZoomControlsEnabled());
- assertTrue(new MapboxMapOptions().zoomControlsEnabled(true).getZoomControlsEnabled());
- assertFalse(new MapboxMapOptions().zoomControlsEnabled(false).getZoomControlsEnabled());
- }
-
- @Test
public void testStyleUrl() {
assertEquals(Style.DARK, new MapboxMapOptions().styleUrl(Style.DARK).getStyleUrl());
assertNotEquals(Style.LIGHT, new MapboxMapOptions().styleUrl(Style.DARK).getStyleUrl());
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java
index d1f99ad41e..0f4e4dfd36 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java
@@ -229,18 +229,6 @@ public class UiSettingsTest {
}
@Test
- public void testZoomControlsEnabled() {
- uiSettings.setZoomControlsEnabled(true);
- assertEquals("Zoom controls should be enabled", true, uiSettings.isZoomControlsEnabled());
- }
-
- @Test
- public void testZoomControlsDisabled() {
- uiSettings.setZoomControlsEnabled(false);
- assertEquals("Zoom controls should be disabled", false, uiSettings.isZoomControlsEnabled());
- }
-
- @Test
public void testDoubleTapGesturesEnabled() {
uiSettings.setDoubleTapGesturesEnabled(true);
assertEquals("DoubleTap gesture should be enabled", true, uiSettings.isDoubleTapGesturesEnabled());
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
index 21d843117e..c195372d90 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
@@ -96,7 +96,6 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa
@Override
public void onMapReady(MapboxMap map) {
mapboxMap = map;
- mapboxMap.getUiSettings().setZoomControlsEnabled(true);
setupNavigationView(mapboxMap.getLayers());
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java
index 5b00e3e1b1..7b01f971bf 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/textureview/TextureViewDebugModeActivity.java
@@ -96,7 +96,6 @@ public class TextureViewDebugModeActivity extends AppCompatActivity implements O
@Override
public void onMapReady(MapboxMap map) {
mapboxMap = map;
- mapboxMap.getUiSettings().setZoomControlsEnabled(true);
setupNavigationView(mapboxMap.getLayers());
setupZoomView();
@@ -105,7 +104,7 @@ public class TextureViewDebugModeActivity extends AppCompatActivity implements O
private void setFpsView() {
final TextView fpsView = (TextView) findViewById(R.id.fpsView);
- mapboxMap.setOnFpsChangedListener(fps -> fpsView.setText(String.format(Locale.US,"FPS: %4.2f", fps)));
+ mapboxMap.setOnFpsChangedListener(fps -> fpsView.setText(String.format(Locale.US, "FPS: %4.2f", fps)));
}
private void setupNavigationView(List<Layer> layerList) {