Commit Graph

675 Commits

Author SHA1 Message Date
Brad Leege
511801c17a [android] #5303 - Updating code to take properly merge what each branch intended for nativeUpdateMarker 2016-06-09 17:01:23 -05:00
Brad Leege
b90571107d [android] #5291 - Fixing merge conflicts 2016-06-09 14:35:10 -05:00
Brad Leege
d67b88dba9 Merge branch 'release-android-v4.1.0'
# Conflicts:
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
#	platform/android/src/jni.cpp
#	src/mbgl/geometry/buffer.hpp
#	src/mbgl/geometry/glyph_atlas.cpp
#	src/mbgl/geometry/glyph_atlas.hpp
#	src/mbgl/geometry/line_atlas.cpp
#	src/mbgl/geometry/vao.cpp
#	src/mbgl/gl/gl_object_store.cpp
#	src/mbgl/gl/gl_object_store.hpp
#	src/mbgl/renderer/frame_history.cpp
#	src/mbgl/shader/shader.cpp
#	src/mbgl/sprite/sprite_atlas.cpp
#	src/mbgl/sprite/sprite_atlas.hpp
#	src/mbgl/text/glyph_pbf.hpp
2016-06-09 14:00:49 -05:00
Brad Leege
c9d78f3f62 [android] #5284 - Restoring 4.1.0-SNAPSHOT version 2016-06-08 17:12:28 -05:00
Brad Leege
6ce55ac2e8 [android] #5284 - Android 4.1.0-beta.2 Changelog 2016-06-08 17:08:37 -05:00
Brad Leege
acdaae177b [android] #5284 - Fixing JavaDoc link error that prevented JavaDoc generation 2016-06-08 14:53:01 -05:00
Brad Leege
64df50018f [android] #5284 - Setting 4.1.0-beta.2 version information 2016-06-08 14:04:41 -05:00
Brad Leege
61a5bea043 [android] #5237 - Enabled Updates To InfoWindow's Title and Snippet 2016-06-07 15:04:11 -05:00
Thiago Marcos P. Santos
b711979e32 [android] #5254 - fix ARMv5 support
Backported patches fixing ARMv5 support for issue #3985.
2016-06-06 23:31:51 +03:00
Brad Leege
f4a82bd367 [android] #5186 - Starting rotateSessionId before Telemetry Starts and ensuring that mapboxSessionId is initialized 2016-06-06 10:56:55 -05:00
Brad Leege
7a97d7bd90 [android] #5186 - Starting rotateSessionId before Telemetry Starts and ensuring that mapboxSessionId is initialized 2016-06-06 10:50:06 -05:00
Tobrun Van Nuland
65330bda8c [android] #5167 - add support annotations to MarkerView 2016-06-06 14:46:16 +02:00
Tobrun Van Nuland
cfca379651 [android] #5241 -float rotation on markerview 2016-06-06 13:58:04 +02:00
Tobrun Van Nuland
eb5ff35d6e [android] #5076 - increase cache size 2016-06-06 12:07:21 +02:00
Tobrun Van Nuland
24b8cb7900 [android] #5076 - invalidate MarkerViews when adding a MarkerView 2016-06-06 12:00:18 +02:00
Tobrun Van Nuland
517545f79e [android] #5076 - add getter for View of MarkerView, update public API javadoc of MarkerView select 2016-06-06 11:54:03 +02:00
Tobrun
0a646b4487 [android] #5076 - fixed update marker for MarkerView, rewrite update marker jni, cleanup animation api 2016-06-06 11:13:40 +02:00
Tobrun Van Nuland
436c23c40b [android] #5171 - introduce new select/deselect animation system for view markers 2016-06-05 14:23:24 +02:00
Cameron
32a3d98be0 Merge branch '5193-fix-style-url' of github.com:mapbox/mapbox-gl-native into 5193-fix-style-url 2016-06-03 14:59:01 -04:00
Cameron
ea67a995de changed satellite-hybrid to street in string.xml 2016-06-03 14:58:43 -04:00
Tobrun Van Nuland
aa83245c07 [android] #5193 - fix broken test case on Icon 2016-06-03 19:59:24 +02:00
John Firebaugh
2fd673befc [docs] Remove references to manual submodule initialization 2016-06-03 09:51:39 -07:00
Cameron
0bfe951b55 [android] Fix style urls
Fixes #5193
2016-06-03 12:38:09 -04:00
Tobrun
087cad037f [android] #5214 - remove requirement adapter for MarkerView, allow using Icon instead 2016-06-03 08:00:56 +02:00
John Firebaugh
e802aedb8c [core, node, android] Remove used "base" parameter from setStyleJSON 2016-06-02 16:33:56 -07:00
Tobrun
fe40127b12 [android] #4929 - fix unit tests MyLocationSettings 2016-06-02 17:21:20 -05:00
Tobrun Van Nuland
041a351fb2 [android] #4929 - final fixes for refactor MyLocationView 2016-06-02 17:21:20 -05:00
Tobrun Van Nuland
d2c9f26cb6 [android] 4929 - fix tracking mode location calculation 2016-06-02 17:21:20 -05:00
Tobrun Van Nuland
3d2cc05121 [android] #4929 - MyLocationView now requires less drawables to configure, reuses the foreground instead. 2016-06-02 17:21:20 -05:00
Tobrun Van Nuland
163ee916e5 [android] #4929 - rewrite MyLocationView with camera and transformation matrix 2016-06-02 17:21:20 -05:00
John Firebaugh
c902f9098b [core] Rationalize naming for style-related code 2016-06-02 14:51:39 -07:00
John Firebaugh
d7e1ecd19e [core] Generalize Map::{add,remove}CustomLayer 2016-06-02 14:51:39 -07:00
Tobrun Van Nuland
c7fb8890fe [android] #4727 - fix proguard test app 2016-06-02 09:39:14 -05:00
Tobrun Van Nuland
7a7efcf3b7 [android] #4727 - fix proguard test app 2016-06-02 09:25:40 +02:00
John Firebaugh
0fba70d5a8 [all] Rationalize annotation API 2016-06-01 17:37:01 -07:00
John Firebaugh
8985b1311b [core] Use geometry.hpp types for shape annotations 2016-06-01 17:36:50 -07:00
John Firebaugh
efaf6461aa [android] Basic cleanups in annotation JNI code 2016-06-01 17:36:50 -07:00
John Firebaugh
555c9ed863 [android] Simplify the JNI definitions for annotation methods
Instead of providing both singleton and List-based implementations:

* Define everything in terms of arrays
* Do singleton ⇢ array and List ⇢ array conversions in Java
2016-06-01 17:36:50 -07:00
Bruno de Oliveira Abinader
a3e0c60a7c [build] Added unique_resource as dependency 2016-06-01 13:53:39 +03:00
Brad Leege
b0de21ed1d [android] #5126 - Serialize Bitrise Scheduled Build Process 2016-05-31 12:41:45 -05:00
John Firebaugh
faaafb8387 [core] Replace clipper and libtess with earcut.hpp 2016-05-31 10:15:18 -07:00
Tobrun
c66cf0f73f [android] #5113 - added javadoc for MyLocationViewSettings 2016-05-30 19:09:27 +02:00
Brad Leege
0c9d544119 [android] #5176 - Changing Telemetry events endpoint to events.mapbox.com 2016-05-27 18:27:09 -05:00
Tobrun Van Nuland
9f9b310a2f [android] #5106 - add check for destroyed map view for addMarker() 2016-05-27 11:46:18 -05:00
Tobrun Van Nuland
78fe86fcb1 [android] #5106 - add check for destroyed map view for addMarker() 2016-05-27 11:43:59 -05:00
Rob | Labs
d4b3d75700 [privacy] [android] Remove logging of location due to privacy leak.
* Location logs are not just kept on the device.
* Some logging packages, e.g.,
 Firebase, now has the option to upload logs to cloud.
* This closes a potential privacy leak.
2016-05-27 10:52:14 -05:00
Rob | Labs
c53a1a3dce [privacy] [android] Remove logging of location due to privacy leak.
* Location logs are not just kept on the device.
* Some logging packages, e.g.,
 Firebase, now has the option to upload logs to cloud.
* This closes a potential privacy leak.
2016-05-27 10:50:04 -05:00
Tobrun Van Nuland
d5cd1e1f9d [android] #5113 - added javadoc to the MarkerView API 2016-05-27 10:25:55 -05:00
Tobrun Van Nuland
f75b4f15dd [android] #5113 - added javadoc for MarkerViewManager 2016-05-27 10:25:15 -05:00
Tobrun Van Nuland
6cfee1db7c [android] #5113 - added javadoc to the MarkerView API 2016-05-27 14:12:01 +02:00