summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2016-05-18 23:04:12 +0200
committerBrad Leege <bleege@gmail.com>2016-05-18 14:45:04 -0700
commit5fe43e43f2ad8b4ef04ff2dee0788c4f5cd9e3cf (patch)
tree43bc8c0130812cc8cde3b4014f86d3f1b1204fc7 /platform/android
parente8ea7483a7ed44d2786e2e4d5a1979cc8a1e32b6 (diff)
downloadqtlocation-mapboxgl-5fe43e43f2ad8b4ef04ff2dee0788c4f5cd9e3cf.tar.gz
[android] - using deprecate annotation for access token javadoc
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java12
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java15
2 files changed, 7 insertions, 20 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
index 0a8ffc0e2c..be4819064e 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
@@ -834,13 +834,7 @@ public class MapView extends FrameLayout {
//
/**
- * <p>
- * DEPRECATED @see MapboxAccountManager#start(String)
- * </p>
- *
- * <p>
* Sets the current Mapbox access token used to load map styles and tiles.
- * </p>
* <p>
* You must set a valid access token before you call {@link MapView#onCreate(Bundle)}
* or an exception will be thrown.
@@ -848,6 +842,7 @@ public class MapView extends FrameLayout {
*
* @param accessToken Your public Mapbox access token.
* @see MapView#onCreate(Bundle)
+ * @deprecated As of release 4.1.0, replaced by {@link com.mapbox.mapboxsdk.MapboxAccountManager#start(Context, String)}
*/
@Deprecated
@UiThread
@@ -864,13 +859,10 @@ public class MapView extends FrameLayout {
}
/**
- * <p>
- * DEPRECATED @see MapboxAccountManager#getAccessToken()
- * </p>
- *
* Returns the current Mapbox access token used to load map styles and tiles.
*
* @return The current Mapbox access token.
+ * @deprecated As of release 4.1.0, replaced by {@link MapboxAccountManager#getAccessToken()}
*/
@Deprecated
@UiThread
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 c45ee13ed1..0e763a9989 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
@@ -1,5 +1,6 @@
package com.mapbox.mapboxsdk.maps;
+import android.content.Context;
import android.graphics.Bitmap;
import android.location.Location;
import android.os.SystemClock;
@@ -11,6 +12,8 @@ import android.support.v4.util.LongSparseArray;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
+
+import com.mapbox.mapboxsdk.MapboxAccountManager;
import com.mapbox.mapboxsdk.annotations.Annotation;
import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
import com.mapbox.mapboxsdk.annotations.Icon;
@@ -581,16 +584,11 @@ public class MapboxMap {
//
/**
- * <p>
- * DEPRECATED @see MapboxAccountManager#start(String)
- * </p>
- *
- * <p>
* Sets the current Mapbox access token used to load map styles and tiles.
- * </p>
*
* @param accessToken Your public Mapbox access token.
* @see MapView#setAccessToken(String)
+ * @deprecated As of release 4.1.0, replaced by {@link com.mapbox.mapboxsdk.MapboxAccountManager#start(Context, String)}
*/
@Deprecated
@UiThread
@@ -599,13 +597,10 @@ public class MapboxMap {
}
/**
- * <p>
- * DEPRECATED @see MapboxAccountManager#getAccessToken()
- * </p>
- *
* Returns the current Mapbox access token used to load map styles and tiles.
*
* @return The current Mapbox access token.
+ * @deprecated As of release 4.1.0, replaced by {@link MapboxAccountManager#getAccessToken()}
*/
@Deprecated
@UiThread