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.

6 files changed, 60 insertions, 70 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewContainer.java
deleted file mode 100644
index d590582f09..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewContainer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mapbox.mapboxsdk.annotations;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-/**
- * ViewGroup that dispatches TouchEvents to the parent ViewGroup.
- * <p>
- * This allows to dispatch touch events that occur on MarkerView to MapView.
- * https://github.com/mapbox/mapbox-gl-native/issues/5388
- * </p>
- */
-public class MarkerViewContainer extends FrameLayout {
-
-  public MarkerViewContainer(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    setTag(false);
-  }
-
-  @Override
-  public boolean dispatchTouchEvent(MotionEvent ev) {
-    super.dispatchTouchEvent(ev);
-    boolean actionUp = (boolean) getTag();
-    if (!actionUp) {
-      ((ViewGroup) getParent()).onTouchEvent(ev);
-    } else {
-      setTag(false);
-    }
-    return true;
-  }
-}
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 0f1298eeaf..315e12d280 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,7 +8,6 @@ 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;
@@ -504,26 +503,6 @@ 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) {
@@ -552,6 +531,34 @@ 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.
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
index e91779dfd1..0c77723354 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
@@ -10,7 +10,6 @@ import com.mapbox.mapboxsdk.annotations.Annotation;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
 import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerView;
 import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
@@ -257,11 +256,7 @@ class AnnotationManager {
 
   private MarkerView prepareViewMarker(BaseMarkerViewOptions markerViewOptions) {
     MarkerView marker = markerViewOptions.getMarker();
-    Icon icon = markerViewOptions.getIcon();
-    if (icon == null) {
-      icon = IconFactory.getInstance(mapView.getContext()).defaultMarkerView();
-    }
-    marker.setIcon(icon);
+    iconManager.loadIconForMarkerView(marker);
     return marker;
   }
 
@@ -665,16 +660,24 @@ class AnnotationManager {
           if (annotation.getId() == newSelectedMarkerId) {
             Marker marker = (Marker) annotation;
 
-            if (!(marker instanceof MarkerView)) {
+            if (marker instanceof MarkerView) {
+              handledDefaultClick = markerViewManager.onClickMarkerView((MarkerView) marker);
+            } else {
               if (onMarkerClickListener != null) {
                 // end developer has provided a custom click listener
                 handledDefaultClick = onMarkerClickListener.onMarkerClick(marker);
               }
+            }
+
+            if (annotation instanceof MarkerView) {
+              markerViewManager.onClickMarkerView((MarkerView) annotation);
+            } else {
               if (!handledDefaultClick) {
                 // only select marker if user didn't handle the click event themselves
                 selectMarker(marker);
               }
             }
+
             return true;
           }
         }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
index c152630278..c9d81a88bc 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
@@ -71,6 +71,27 @@ class IconManager {
     return icon;
   }
 
+  Icon loadIconForMarkerView(MarkerView marker) {
+    Icon icon = marker.getIcon();
+    int iconSize = icons.size() + 1;
+    if (icon == null) {
+      icon = IconFactory.getInstance(nativeMapView.getContext()).defaultMarkerView();
+      marker.setIcon(icon);
+    }
+    Bitmap bitmap = icon.getBitmap();
+    averageIconHeight = averageIconHeight + (bitmap.getHeight() - averageIconHeight) / iconSize;
+    averageIconWidth = averageIconWidth + (bitmap.getWidth() - averageIconWidth) / iconSize;
+    if (!icons.contains(icon)) {
+      icons.add(icon);
+    } else {
+      Icon oldIcon = icons.get(icons.indexOf(icon));
+      if (!oldIcon.getBitmap().sameAs(icon.getBitmap())) {
+        throw new IconBitmapChangedException();
+      }
+    }
+    return icon;
+  }
+
   int getTopOffsetPixelsForIcon(Icon icon) {
     return (int) (nativeMapView.getTopOffsetPixelsForAnnotationSymbol(icon.getId()) * nativeMapView.getPixelRatio());
   }
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"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
index b8a008e592..f2f82865d1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
@@ -196,13 +196,6 @@ public class MarkerViewActivity extends AppCompatActivity {
         // open infowindow offscreen markers
         mapboxMap.selectMarker(markerRightOffScreen);
         mapboxMap.selectMarker(markerRightBottomOffScreen);
-
-        mapboxMap.setOnMapClickListener(new MapboxMap.OnMapClickListener() {
-          @Override
-          public void onMapClick(@NonNull LatLng point) {
-            Toast.makeText(MarkerViewActivity.this, point.toString(), Toast.LENGTH_SHORT).show();
-          }
-        });
       }
     });
   }