diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2017-04-11 21:46:23 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2017-04-11 21:46:23 -0400 |
| commit | 12b6fdbe3b1caad95089150d5c3ab69af31fb725 (patch) | |
| tree | 414df39761f08c8221e9f51f73c18ced91656a11 /platform/android/MapboxGLAndroidSDK/src/main/res | |
| parent | 0cb05f926b7dcc18ba59c7a3c16f94860d1a0b1b (diff) | |
| parent | 4d0605a004844726fc5f5e015c6d4320a880bfa0 (diff) | |
| download | qtlocation-mapboxgl-12b6fdbe3b1caad95089150d5c3ab69af31fb725.tar.gz | |
Merge branch 'release-ios-v3.5.0-android-v5.0.0' into boundsj-merge-release-branch
# Conflicts:
# cmake/core-files.cmake
# mapbox-gl-js
# platform/android/CHANGELOG.md
# platform/ios/CHANGELOG.md
# platform/macos/CHANGELOG.md
# platform/qt/bitrise-qt5.yml
# src/mbgl/gl/attribute.hpp
# src/mbgl/gl/context.cpp
# src/mbgl/gl/program.hpp
# src/mbgl/map/map.cpp
# src/mbgl/programs/program.hpp
# src/mbgl/renderer/painter.cpp
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/res')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml index 7a38437fee..e6a2677785 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml @@ -8,7 +8,7 @@ android:contentDescription="@null" android:visibility="gone"/> - <com.mapbox.mapboxsdk.annotations.MarkerViewContainer + <FrameLayout android:id="@+id/markerViewContainer" android:layout_width="match_parent" android:layout_height="match_parent" |