diff options
| author | Guardiola31337 <pablo.guardiola@mapbox.com> | 2017-11-28 10:40:09 +0100 |
|---|---|---|
| committer | Guardiola31337 <pablo.guardiola@mapbox.com> | 2017-11-28 10:47:42 +0100 |
| commit | 4f537a6522733526bbc3c75f8557bfa57797e1e9 (patch) | |
| tree | 16cdb1003dcfabb3725dedc65f3e4c0430fbe2a7 | |
| parent | 85bc035be333b166ace6c3029dcbf89bb1e831e9 (diff) | |
| download | qtlocation-mapboxgl-upstream/pg-10527-pre-19-issue.tar.gz | |
[android] use location engine abstraction instead of location source (lost) in MyLocationView#initupstream/pg-10527-pre-19-issue
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/circle.yml b/circle.yml index 09421bec9b..fcbc1d8312 100644 --- a/circle.yml +++ b/circle.yml @@ -334,7 +334,7 @@ jobs: - deploy: name: Publish to Maven command: | - if [ "${CIRCLE_BRANCH}" == "release-agua" ]; then make run-android-upload-archives ; fi + if [ "${CIRCLE_BRANCH}" == "pg-10527-pre-19-issue" ]; then make run-android-upload-archives ; fi # ------------------------------------------------------------------------------ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java index aa7934ec1e..3fe3c7b40d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java @@ -33,7 +33,6 @@ import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.constants.MyBearingTracking; import com.mapbox.mapboxsdk.constants.MyLocationTracking; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.location.LocationSource; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Projection; import com.mapbox.services.android.telemetry.location.LocationEngine; @@ -162,7 +161,7 @@ public class MyLocationView extends View { } @Deprecated - public void init(LocationSource locationSource) { + public void init(LocationEngine locationSource) { this.locationEngine = locationSource; } |