diff options
| author | Brad Leege <bleege@gmail.com> | 2016-06-09 14:00:49 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2016-06-09 14:00:49 -0500 |
| commit | d67b88dba94a5e50eabaa8c133bb66fc3da8ee6f (patch) | |
| tree | 29a5bef10a72aff72efdf7d92b0ab30fdf94684e /platform/android/MapboxGLAndroidSDK/src/main/res | |
| parent | c3cbe67c018a2431140babf2b8ba4c403e5e429f (diff) | |
| parent | c9d78f3f62fe02314bcc2d2a9dcef8d323b6e161 (diff) | |
| download | qtlocation-mapboxgl-d67b88dba94a5e50eabaa8c133bb66fc3da8ee6f.tar.gz | |
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
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/res')
4 files changed, 12 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml index 9799487f12..e944a5b4d1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml @@ -31,7 +31,7 @@ <com.mapbox.mapboxsdk.maps.widgets.MyLocationView android:id="@+id/userLocationView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </merge>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/view_image_marker.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/view_image_marker.xml new file mode 100644 index 0000000000..7e4a079063 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/view_image_marker.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml index d6cca7090f..fd0f4b98e7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml @@ -9,6 +9,5 @@ <dimen name="ten_dp">10dp</dimen> <dimen name="sixteen_dp">16dp</dimen> <dimen name="seventy_six_dp">76dp</dimen> - <dimen name="my_locationview_size">64dp</dimen> <dimen name="my_locationview_outer_circle">18dp</dimen> </resources> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index becbcce0b0..687b85b2d8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -11,11 +11,14 @@ <string name="infoWindowAddress">Address</string> <!-- these are public --> - <!-- {@deprecated Use Style.getXStyleUrl(int version) instead.} --> + <!-- Using one of these constants means your map style will always use the latest version and + may change as we improve the style. --> <string name="style_mapbox_streets">mapbox://styles/mapbox/streets-v9</string> + <string name="style_outdoors">mapbox://styles/mapbox/outdoors-v9</string> + <!-- Note: Emerald style has been deprecated and will be removed in a future release--> <string name="style_emerald">mapbox://styles/mapbox/emerald-v8</string> <string name="style_light">mapbox://styles/mapbox/light-v9</string> <string name="style_dark">mapbox://styles/mapbox/dark-v9</string> <string name="style_satellite">mapbox://styles/mapbox/satellite-v9</string> - <string name="style_satellite_streets">mapbox://styles/mapbox/satellite-hybrid-v9</string> + <string name="style_satellite_streets">mapbox://styles/mapbox/satellite-streets-v9</string> </resources> |