diff options
| author | Tobrun <tobrun@mapbox.com> | 2017-03-30 17:30:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-30 17:30:47 +0200 |
| commit | a46d91f7c5cbcdd9343d1a3dfba17e375a466e2a (patch) | |
| tree | 9d65795b9955cd5aa016f43ce945e8c9962e7f9f /platform/android/MapboxGLAndroidSDK/src/main/res | |
| parent | dcb14f98ee534b22cae8a0f829302a0b2b2459b2 (diff) | |
| download | qtlocation-mapboxgl-a46d91f7c5cbcdd9343d1a3dfba17e375a466e2a.tar.gz | |
Revert 5.x touch changes (#8585)
* Revert "[android] - only dispatch events if not handled by MarkerView (#8447)"
This reverts commit 09d76854ab15b2a6f473c270da9d46e903e426da.
* Revert "[android] - move touch handling of MarkerViews back to View#setOnClickListener. Workaround panning issue by dispatching touch events to the parent ViewGroup. (#8272)"
This reverts commit 1693b389d7d17315b8a2a9bdd862207ace053f77.
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" |