[android] - Implements Android bindings for offline API

Fixes #3891
mapbox · Feb 25, 2016 · ca1fac3 · ca1fac3
1 parent f1e09ce
commit ca1fac3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
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
@@ -646,6 +646,9 @@ public double getZoom() {
      */
     @UiThread
     public void setMinZoom(@FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM) double minZoom) {
+<<<<<<< f1e09ce42e64233f4c1962967433622471c6569d
+>>>>>>> [android] - Implements Android bindings for offline API
+=======
 >>>>>>> [android] - Implements Android bindings for offline API
         mNativeMapView.setMinZoom(minZoom);
     }
@@ -678,6 +681,9 @@ void setZoomControlsEnabled(boolean enabled) {
      * @param enabled If true, the zoom controls are enabled.
      */
     public void setZoomControlsEnabled(boolean enabled) {
+<<<<<<< f1e09ce42e64233f4c1962967433622471c6569d
+>>>>>>> [android] - Implements Android bindings for offline API
+=======
 >>>>>>> [android] - Implements Android bindings for offline API
         mZoomButtonsController.setVisible(enabled);
     }

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
@@ -1,8 +1,11 @@
 package com.mapbox.mapboxsdk.maps;
 
 import android.content.Context;
+<<<<<<< f1e09ce42e64233f4c1962967433622471c6569d
 <<<<<<< f9fd748547ce49d6e1b7174d7f511ccc2264166a
 
+=======
+>>>>>>> [android] - Implements Android bindings for offline API
 =======
 >>>>>>> [android] - Implements Android bindings for offline API
 import android.location.Location;