summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun@mapbox.com>2017-04-04 21:14:32 +0200
committerGitHub <noreply@github.com>2017-04-04 21:14:32 +0200
commite34b4718422438af365fe5ede67d1c490e95d9cc (patch)
tree00a6b2da74e6e08c6b2b6754384f7680c3e2c72e
parent6718d2cc5145497bb7503ab0bb9db4cbe6e1deb7 (diff)
downloadqtlocation-mapboxgl-e34b4718422438af365fe5ede67d1c490e95d9cc.tar.gz
Release android v5.0.2 (#8629)
* [android] - update CHANGELOG.md for v5.0.2 release * [android] - bump version name to 5.0.2 * [android] - fixup javadoc errors * bump SNAPSHOT version
-rw-r--r--platform/android/CHANGELOG.md1
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java2
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java9
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java12
4 files changed, 12 insertions, 12 deletions
diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md
index 01d7b1ab5b..2b0e40f21e 100644
--- a/platform/android/CHANGELOG.md
+++ b/platform/android/CHANGELOG.md
@@ -6,6 +6,7 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to
5.0.2 is a patch release that contains the following changes:
+* Binary shader caching [#8604](https://github.com/mapbox/mapbox-gl-native/pull/8604)
* Fix resource transform callback [#8582](https://github.com/mapbox/mapbox-gl-native/pull/8582)
* Restore onTouch behaviour to 4.x version [#8585](https://github.com/mapbox/mapbox-gl-native/pull/8585)
* Restore anchoring after updating MarkerView Icon [#8519](https://github.com/mapbox/mapbox-gl-native/pull/8519)
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
index 74170bb72b..a8fc58d51c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
@@ -293,7 +293,7 @@ public final class CameraPosition implements Parcelable {
* Set the tilt in degrees
* <p>
* value is clamped to 0 and 60.
- * <p/>
+ * </p>
*
* @param tilt Tilt value
* @return Builder
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
index f41a022fa2..dd6e43d06a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
@@ -18,11 +18,10 @@ import java.lang.ref.WeakReference;
/**
* Manages locational updates. Contains methods to register and unregister location listeners.
* <ul>
- * <li>You can register a {@link LocationEngineListener} with
- * {@link #addLocationEngineListener(LocationEngineListener)} to receive
- * location updates.</li>
- * <li> You can unregister a {@link LocationEngineListener} with
- * {@link #removeLocationEngineListener(LocationEngineListener)} to stop receiving location updates.</li>
+ * <li>You can register a LocationEngineListener with LocationSource#addLocationEngineListener(LocationEngineListener)
+ * to receive location updates.</li>
+ * <li> You can unregister a LocationEngineListener with
+ * LocationEngine#removeLocationEngineListener(LocationEngineListener)} to stop receiving location updates.</li>
* </ul>
* <p>
* Note: If registering a listener in your Activity.onStart() implementation, you should unregister it in
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
index b253595713..5e9ca7d0a8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
@@ -42,7 +42,7 @@ public class GeoJsonSource extends Source {
}
/**
- * Create an empty GeoJsonSource with non-default {@link GeoJsonOptions}
+ * Create an empty GeoJsonSource with non-default GeoJsonOptions.
*
* @param id the source id
* @param options options
@@ -67,7 +67,7 @@ public class GeoJsonSource extends Source {
}
/**
- * Create a GeoJsonSource from a raw json string and non-default {@link GeoJsonOptions}
+ * Create a GeoJsonSource from a raw json string and non-default GeoJsonOptions
*
* @param id the source id
* @param geoJson raw Json body
@@ -93,7 +93,7 @@ public class GeoJsonSource extends Source {
}
/**
- * Create a GeoJsonSource from a remote geo json file and non-default {@link GeoJsonOptions}
+ * Create a GeoJsonSource from a remote geo json file and non-default GeoJsonOptions
*
* @param id the source id
* @param url remote json file
@@ -105,7 +105,7 @@ public class GeoJsonSource extends Source {
}
/**
- * Create a GeoJsonSource from a {@link FeatureCollection}
+ * Create a GeoJsonSource from a FeatureCollection.
*
* @param id the source id
* @param features the features
@@ -116,7 +116,7 @@ public class GeoJsonSource extends Source {
}
/**
- * Create a GeoJsonSource from a {@link FeatureCollection} and non-default {@link GeoJsonOptions}
+ * Create a GeoJsonSource from a FeatureCollection and non-default GeoJsonOptions.
*
* @param id the source id
* @param features the features
@@ -130,7 +130,7 @@ public class GeoJsonSource extends Source {
/**
* Updates the GeoJson
*
- * @param features the GeoJSON {@link FeatureCollection}
+ * @param features the GeoJSON FeatureCollection
*/
public void setGeoJson(FeatureCollection features) {
checkValidity();