1 files changed, 21 insertions, 28 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
index 315e12d280..0f1298eeaf 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
@@ -8,6 +8,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.util.LongSparseArray;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -503,6 +504,26 @@ public class MarkerViewManager implements MapView.OnMapChangedListener {
                 }
               }
 
+              adaptedView.setOnTouchListener(new View.OnTouchListener() {
+
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                  if (event.getAction() == MotionEvent.ACTION_UP) {
+                    boolean clickHandled = false;
+                    if (onMarkerViewClickListener != null) {
+                      clickHandled = onMarkerViewClickListener.onMarkerClick(marker, v, adapter);
+                      markerViewContainer.setTag(true);
+                    }
+
+                    if (!clickHandled) {
+                      ensureInfoWindowOffset(marker);
+                      select(marker, v, adapter);
+                    }
+                  }
+                  return true;
+                }
+              });
+
               marker.setMapboxMap(mapboxMap);
               markerViewMap.put(marker, adaptedView);
               if (convertView == null) {
@@ -531,34 +552,6 @@ public class MarkerViewManager implements MapView.OnMapChangedListener {
   }
 
   /**
-   * When the provided {@link MarkerView} is clicked on by a user, we check if a custom click
-   * event has been created and if not, display a {@link InfoWindow}.
-   *
-   * @param markerView that the click event occurred.
-   */
-  public boolean onClickMarkerView(MarkerView markerView) {
-    boolean clickHandled = false;
-
-    MapboxMap.MarkerViewAdapter adapter = getViewAdapter(markerView);
-    View view = getView(markerView);
-    if (adapter == null || view == null) {
-      // not a valid state
-      return true;
-    }
-
-    if (onMarkerViewClickListener != null) {
-      clickHandled = onMarkerViewClickListener.onMarkerClick(markerView, view, adapter);
-    }
-
-    if (!clickHandled) {
-      ensureInfoWindowOffset(markerView);
-      select(markerView, view, adapter);
-    }
-
-    return clickHandled;
-  }
-
-  /**
    * Handles the {@link MarkerView}'s info window offset.
    *
    * @param marker that we are ensuring info window offset.