diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-21 11:55:02 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-21 12:04:20 -0700 |
| commit | e488ca702e8f822ba6297a2f3c933ee22ca6ce42 (patch) | |
| tree | 2efe93d84722f37a61b83155510a3da444fc171b /platform/android/MapboxGLAndroidSDK/src/main/res | |
| parent | 1f8910de186f35216791a17a683a55f01031ec81 (diff) | |
| parent | e0fe42d8321d19a4a9cb46edac9fbdb035e70a0c (diff) | |
| download | qtlocation-mapboxgl-e488ca702e8f822ba6297a2f3c933ee22ca6ce42.tar.gz | |
Merge branch 'release-ios-v3.5.0-android-v5.0.0'
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 e6a2677785..7a38437fee 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"/> - <FrameLayout + <com.mapbox.mapboxsdk.annotations.MarkerViewContainer android:id="@+id/markerViewContainer" android:layout_width="match_parent" android:layout_height="match_parent" |