From bd00e88b884c36b6d3804a8eadc901dc61c550bc Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Wed, 30 Mar 2016 11:50:41 -0500 Subject: [PATCH 1/7] [android] #4535 - Setting version to 4.0.0 for release --- platform/android/MapboxGLAndroidSDK/gradle.properties | 2 +- .../fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index 0e3858644..71d479712 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.mapbox.mapboxsdk -VERSION_NAME=4.0.0-SNAPSHOT +VERSION_NAME=4.0.0 POM_DESCRIPTION=Mapbox GL Android SDK POM_URL=https://github.com/mapbox/mapbox-gl-native diff --git a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties index 14ced7955..8c1dcc38c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties +++ b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties @@ -1,3 +1,3 @@ fabric-identifier=com.mapbox.mapboxsdk.mapbox-android-sdk -fabric-version=4.0.0-rc.1 +fabric-version=4.0.0 fabric-build-type=binary From 891fccb6813b0ef12a107a040216cb84938c11b3 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Wed, 30 Mar 2016 13:27:01 -0500 Subject: [PATCH 2/7] [android] #4535 - 4.0.0 Changelog --- platform/android/CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index dd761afb4..7ba51fd36 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -2,6 +2,14 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to do so please see the [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started. +## 4.0.0 + +Mapbox Android 4.0.0 contains the following 3 major new features. + +* MapboxMap API Change ([#3145](https://github.com/mapbox/mapbox-gl-native/issues/3145)) +* Offline Maps ([#3891](https://github.com/mapbox/mapbox-gl-native/issues/3891)) +* Telemetry ([#2421](https://github.com/mapbox/mapbox-gl-native/issues/2421)) + ## 4.0.0-rc.1 * Default Value Bug Fix for MapboxMapOptions ([#4398](https://github.com/mapbox/mapbox-gl-native/issues/4398)) From 56245220b00398069b4983c36018b4697618b565 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 31 Mar 2016 10:53:54 +0200 Subject: [PATCH 3/7] [android] #4553 - remove annotations fix --- .../com/mapbox/mapboxsdk/maps/MapView.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 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 38dd4bccb..45e377393 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 @@ -400,19 +400,17 @@ public class MapView extends FrameLayout { addOnMapChangedListener(new OnMapChangedListener() { @Override public void onMapChanged(@MapChange int change) { - if (change == DID_FINISH_RENDERING_MAP_FULLY_RENDERED) { + if (change == DID_FINISH_RENDERING_MAP_FULLY_RENDERED && mInitialLoad) { + mInitialLoad = false; reloadIcons(); reloadMarkers(); adjustTopOffsetPixels(); - if (mInitialLoad) { - mInitialLoad = false; - if (mOnMapReadyCallbackList.size() > 0) { - Iterator iterator = mOnMapReadyCallbackList.iterator(); - while (iterator.hasNext()) { - OnMapReadyCallback callback = iterator.next(); - callback.onMapReady(mMapboxMap); - iterator.remove(); - } + if (mOnMapReadyCallbackList.size() > 0) { + Iterator iterator = mOnMapReadyCallbackList.iterator(); + while (iterator.hasNext()) { + OnMapReadyCallback callback = iterator.next(); + callback.onMapReady(mMapboxMap); + iterator.remove(); } } } From 55c30148cb968d40a13e1bda61353d3fe791c9bf Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 2 May 2016 13:10:01 -0500 Subject: [PATCH 4/7] [android] Setting version to 4.0.1-SNAPSHOT --- platform/android/MapboxGLAndroidSDK/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index 71d479712..2e626aaa2 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.mapbox.mapboxsdk -VERSION_NAME=4.0.0 +VERSION_NAME=4.0.1-SNAPSHOT POM_DESCRIPTION=Mapbox GL Android SDK POM_URL=https://github.com/mapbox/mapbox-gl-native From e0eeccf84c1512e7057447a5655bd3fbcf4f90e2 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Thu, 12 May 2016 11:15:36 -0500 Subject: [PATCH 5/7] [android] #5014 - Updating Version to 4.0.1 --- platform/android/MapboxGLAndroidSDK/gradle.properties | 2 +- .../fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index 2e626aaa2..dcf02b6d6 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.mapbox.mapboxsdk -VERSION_NAME=4.0.1-SNAPSHOT +VERSION_NAME=4.0.1 POM_DESCRIPTION=Mapbox GL Android SDK POM_URL=https://github.com/mapbox/mapbox-gl-native diff --git a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties index 8c1dcc38c..bdf75cc43 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties +++ b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties @@ -1,3 +1,3 @@ fabric-identifier=com.mapbox.mapboxsdk.mapbox-android-sdk -fabric-version=4.0.0 +fabric-version=4.0.1 fabric-build-type=binary From 006c23128bd526515ff635cb0d3346ecf874f1a1 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Thu, 12 May 2016 11:20:01 -0500 Subject: [PATCH 6/7] [android] #5014 - Updating Changelog --- platform/android/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 7ba51fd36..47b487b96 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -2,6 +2,12 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to do so please see the [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started. +## 4.0.1 + +Mapbox Android 4.0.1 is a patch release to make this bug fix available sooner. + +* onMapReady() not getting called when offline ([#4500](https://github.com/mapbox/mapbox-gl-native/issues/4500)) + ## 4.0.0 Mapbox Android 4.0.0 contains the following 3 major new features. From 716f00c1ae10699d6ab77a59bdb7f7adaac17aec Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Thu, 12 May 2016 12:46:41 -0500 Subject: [PATCH 7/7] [android] #5014 - Removing malformed HTML from Javadocs --- .../mapboxsdk/annotations/BaseMarkerOptions.java | 4 ++-- .../com/mapbox/mapboxsdk/annotations/Marker.java | 3 +-- .../mapbox/mapboxsdk/annotations/MarkerOptions.java | 2 -- .../java/com/mapbox/mapboxsdk/maps/MapboxMap.java | 4 ++-- .../mapboxsdk/telemetry/MapboxEventManager.java | 2 +- .../telemetry/TelemetryLocationReceiver.java | 4 ++-- .../mapbox/mapboxsdk/telemetry/TelemetryService.java | 12 +++++------- .../MapboxGLAndroidSDK/src/main/java/overview.html | 8 +++++--- .../mapbox/mapboxsdk/testapp/utils/TimingLogger.java | 6 +++--- 9 files changed, 21 insertions(+), 24 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java index fe8bf6792..fc2022f9e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java @@ -6,7 +6,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng; /** * Abstract builder class for composing custom Marker objects. - *

+ * * Extending this class requires implementing Parceable interface. * * @param Type of the marker to be composed @@ -43,4 +43,4 @@ public abstract class BaseMarkerOptions + * * An {@link InfoWindow} can be shown when a Marker is pressed - *

*/ public class Marker extends Annotation { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java index a3df23d96..3c4d983dc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java @@ -12,9 +12,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng; *

* Builder for composing {@link com.mapbox.mapboxsdk.annotations.Marker} objects. *

- *

*

Example

- *

* 

  * mMapView.addMarker(new MarkerOptions()
  *   .title("Intersection")
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 e1a9cd8cd..3ca7743fe 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
@@ -309,7 +309,7 @@ public class MapboxMap {
     /**
      * Animates the movement of the camera from the current position to the position defined in the update.
      * During the animation, a call to getCameraPosition() returns an intermediate location of the camera.
-     * 

+     *
      * See CameraUpdateFactory for a set of updates.
      *
      * @param update The change that should be applied to the camera.
@@ -1136,7 +1136,7 @@ public class MapboxMap {
     /**
      * Sets the distance from the edges of the map view’s frame to the edges of the map
      * view’s logical viewport.
-     * 

+     *
      * When the value of this property is equal to {0,0,0,0}, viewport
      * properties such as `centerCoordinate` assume a viewport that matches the map
      * view’s frame. Otherwise, those properties are inset, excluding part of the
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
index 736247bba..832f87678 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
@@ -97,7 +97,7 @@ public class MapboxEventManager {
 
     /**
      * Internal setup of MapboxEventsManager.  It needs to be called once before @link MapboxEventManager#getMapboxEventManager
-     * 

+     *
      * This allows for a cleaner getMapboxEventManager() that doesn't require context and accessToken
      *
      * @param context     The context associated with MapView
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryLocationReceiver.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryLocationReceiver.java
index a35a87eb0..eb08baa9a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryLocationReceiver.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryLocationReceiver.java
@@ -37,7 +37,7 @@ public class TelemetryLocationReceiver extends BroadcastReceiver {
      * 10 seconds that the system allows before considering the receiver to
      * be blocked and a candidate to be killed). You cannot launch a popup dialog
      * in your implementation of onReceive().
-     * 

+     *
      * 
If this BroadcastReceiver was launched through a <receiver> tag,
      * then the object is no longer alive after returning from this
      * function.  This means you should not perform any operations that
@@ -47,7 +47,7 @@ public class TelemetryLocationReceiver extends BroadcastReceiver {
      * {@link Context#bindService(Intent, ServiceConnection, int)}.  If you wish
      * to interact with a service that is already running, you can use
      * {@link #peekService}.
-     * 

+     *
      * 
The Intent filters used in {@link Context#registerReceiver}
      * and in application manifests are not guaranteed to be exclusive. They
      * are hints to the operating system about how to find suitable recipients. It is
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryService.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryService.java
index 0db75c92f..008f355f2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryService.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/TelemetryService.java
@@ -25,7 +25,7 @@ public class TelemetryService extends Service {
      * {@link IBinder} is usually for a complex interface
      * that has been described using
      * aidl.
-     * 

+     *
      * 
Note that unlike other application components, calls on to the
      * IBinder interface returned here may not happen on the main thread
      * of the process.  More information about the main thread can be found in
@@ -93,19 +93,17 @@ public class TelemetryService extends Service {
      * Called by the system every time a client explicitly starts the service by calling
      * {@link Context#startService}, providing the arguments it supplied and a
      * unique integer token representing the start request.  Do not call this method directly.
-     * 

+     *
      * 
For backwards compatibility, the default implementation calls
      * {@link #onStart} and returns either {@link #START_STICKY}
      * or {@link #START_STICKY_COMPATIBILITY}.
-     * 

+     * 

      * 
If you need your application to run on platform versions prior to API
      * level 5, you can use the following model to handle the older {@link #onStart}
      * callback in that case.  The handleCommand method is implemented by
      * you as appropriate:
-     * 

-     * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java
-     * start_compatibility}
-     * 

+     * 

+     *
      * 
Note that the system calls this on your
      * service's main thread.  A service's main thread is the same
      * thread where UI operations take place for Activities running in the
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/overview.html b/platform/android/MapboxGLAndroidSDK/src/main/java/overview.html
index 951b8d8e7..f218b3ccf 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/overview.html
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/overview.html
@@ -1,9 +1,11 @@
 
 
+

 An open source OpenGL-based vector map solution for Android with full styling capabilities.
-

+

+

 For more information, check out our online overview.
-

+

 
 
 
 
-
\ No newline at end of file
+
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java
index 6789b401e..544e73778 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java
@@ -23,7 +23,7 @@ import android.util.Log;
 /**
  * A utility class to help log timings splits throughout a method call.
  * Typical usage is:
- * 

+ *
  * 
  *     TimingLogger timings = new TimingLogger(TAG, "methodA");
  *     // ... do some work A ...
@@ -34,9 +34,9 @@ import android.util.Log;
  *     timings.addSplit("work C");
  *     timings.dumpToLog();
  * 

- * 

+ *
  * 
The dumpToLog call would add the following to the log:

- * 

+ *
  * 
  *     D/TAG     ( 3459): methodA: begin
  *     D/TAG     ( 3459): methodA:      9 ms, work A