[android] Deprecate setPrefetchesTiles to migrate to setPrefetchZoomDelta.

4 files changed, 15 insertions, 15 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 0deea4e1a2..37b143aa18 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -101,7 +101,6 @@ public final class MapboxMap {
     setDebugActive(options.getDebugActive());
     setApiBaseUrl(options);
     setPrefetchesTiles(options);
-    setPrefetchZoomDelta(options);
   }
 
   /**
@@ -248,12 +247,16 @@ public final class MapboxMap {
   // Style
 
   /**
-   * Sets tile pre-fetching from MapboxOptions.
+   * Sets tile pre-fetching zoom delta from MapboxOptions.
    *
    * @param options the options object
    */
   private void setPrefetchesTiles(@NonNull MapboxMapOptions options) {
-    setPrefetchesTiles(options.getPrefetchesTiles());
+    if (!options.getPrefetchesTiles()) {
+      setPrefetchZoomDelta(0);
+    } else {
+      setPrefetchZoomDelta(options.getPrefetchZoomDelta());
+    }
   }
 
   /**
@@ -261,7 +264,9 @@ public final class MapboxMap {
    * tile is rendered as soon as possible at the expense of a little bandwidth.
    *
    * @param enable true to enable
+   * @deprecated Use {@link #setPrefetchZoomDelta(int)} instead.
    */
+  @Deprecated
   public void setPrefetchesTiles(boolean enable) {
     nativeMapView.setPrefetchTiles(enable);
   }
@@ -277,19 +282,12 @@ public final class MapboxMap {
   }
 
   /**
-   * Sets tile pre-fetching zoom delta from MapboxOptions.
-   *
-   * @param options the options object
-   */
-  private void setPrefetchZoomDelta(@NonNull MapboxMapOptions options) {
-    setPrefetchZoomDelta(options.getPrefetchZoomDelta());
-  }
-
-  /**
    * Set the tile pre-fetching zoom delta. Pre-fetching makes sure that a low-resolution
    * tile at the (current_zoom_level - delta) is rendered as soon as possible at the
    * expense of a little bandwidth.
-   * Note: Setting zoom delta to 0 will disable pre-fetching.
+   * Note: This operation will override the MapboxMapOptions#setPrefetchesTiles(boolean)
+   *       Setting zoom delta to 0 will disable pre-fetching.
+   * Default zoom delta is 4.
    *
    * @param delta zoom delta
    */
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 06ecb38567..dc539a63dc 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
@@ -638,7 +638,9 @@ public class MapboxMapOptions implements Parcelable {
    *
    * @param enable true to enable
    * @return This
+   * @deprecated Use {@link #setPrefetchZoomDelta(int)} instead.
    */
+  @Deprecated
   @NonNull
   public MapboxMapOptions setPrefetchesTiles(boolean enable) {
     this.prefetchesTiles = enable;
@@ -653,7 +655,6 @@ public class MapboxMapOptions implements Parcelable {
    *       Setting zoom delta to 0 will disable pre-fetching.
    * Default zoom delta is 4.
    *
-   *
    * @param delta zoom delta
    * @return This
    */
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 60a1efc771..36071cc2a7 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
@@ -69,6 +69,7 @@
     <public name="mapbox_foregroundLoadColor" type="attr" />
 
     <public name="mapbox_enableTilePrefetch" type="attr" />
+    <public name="mapbox_prefetchZoomDelta" type="attr"/>
     <public name="mapbox_enableZMediaOverlay" type="attr" />
 
     <!-- Exposed content descriptions -->
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index 4e5675b64b..8cb637fa38 100644
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -1051,7 +1051,7 @@ jni::jboolean NativeMapView::getPrefetchTiles(JNIEnv&) {
 }
 
 void NativeMapView::setPrefetchZoomDelta(JNIEnv&, jni::jint delta) {
-    map->setPrefetchZoomDelta(uint8_t(abs(delta)));
+    map->setPrefetchZoomDelta(uint8_t(delta));
 }
 
 jni::jint NativeMapView::getPrefetchZoomDelta(JNIEnv&) {