From d508e5930479da8927ea0f2b3654163c8e4f4942 Mon Sep 17 00:00:00 2001
From: bastien wermeille <bastien.wermeille@gmail.com>
Date: Tue, 15 Sep 2020 17:59:16 +0200
Subject: [PATCH] Fix setOnTouchListener limitations

---
 gradle/dependencies.gradle                                      | 2 +-
 .../plugins/annotation/DraggableAnnotationController.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 30f86f5a6..99fea0a84 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -7,7 +7,7 @@
   ]
 
   version = [
-      mapboxMapSdk       : '9.4.0',
+      mapboxMapSdk       : '9.5.0-beta.1',
       mapboxJava         : '5.5.0',
       mapboxTurf         : '5.5.0',
       playLocation       : '16.0.0',
diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java
index b9be243d5..0c5d47b26 100644
--- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java
+++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java
@@ -74,7 +74,7 @@ public DraggableAnnotationController(MapView mapView, MapboxMap mapboxMap,
 
     androidGesturesManager.setMoveGestureListener(new AnnotationMoveGestureListener());
 
-    mapView.setOnTouchListener(new View.OnTouchListener() {
+    mapView.addOnTouchListener(new View.OnTouchListener() {
       @Override
       public boolean onTouch(View v, MotionEvent event) {
         // Using active gesture manager