[android] #3891 - revert map changes to allow rebase

mapbox · Feb 25, 2016 · e0746f0 · e0746f0
1 parent 4e5a0cd
commit e0746f0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 25 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
@@ -619,13 +619,6 @@ int getContentPaddingBottom() {
     // Zoom
     //
 
-<<<<<<< f9fd748547ce49d6e1b7174d7f511ccc2264166a
-    double getZoom() {
-        return mNativeMapView.getZoom();
-    }
-
-    void setMinZoom(@FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM) double minZoom) {
-=======
     /**
      * Returns the current zoom level of the map view.
      *
@@ -646,10 +639,6 @@ 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);
     }
 
@@ -665,9 +654,6 @@ void setMaxZoom(@FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxCons
         return mNativeMapView.getMaxZoom();
     }
 
-<<<<<<< f9fd748547ce49d6e1b7174d7f511ccc2264166a
-    void setZoomControlsEnabled(boolean enabled) {
-=======
     /**
      * <p>
      * Sets whether the zoom controls are enabled.
@@ -681,10 +667,6 @@ 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,13 +1,6 @@
 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;
 import android.os.Bundle;
 import android.os.SystemClock;