[android] - MarkerView deselect events with OnMarkerViewClickListener integration (#8996)

This commit is contained in:
Tobrun
2017-05-15 13:39:34 +02:00
committed by GitHub
parent a68788a2cf
commit 59442167b1

View File

@@ -670,12 +670,15 @@ class AnnotationManager {
for (Marker nearbyMarker : nearbyMarkers) {
for (Marker selectedMarker : selectedMarkers) {
if (nearbyMarker.equals(selectedMarker)) {
if (onMarkerClickListener != null) {
// end developer has provided a custom click listener
if (nearbyMarker instanceof MarkerView) {
handledDefaultClick = markerViewManager.onClickMarkerView((MarkerView) nearbyMarker);
} else if (onMarkerClickListener != null) {
handledDefaultClick = onMarkerClickListener.onMarkerClick(nearbyMarker);
if (!handledDefaultClick) {
deselectMarker(nearbyMarker);
}
}
if (!handledDefaultClick) {
// only deselect marker if user didn't handle the click event themselves
deselectMarker(nearbyMarker);
}
return true;
}