diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java index a99a7d08da..d0e5777602 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java @@ -31,15 +31,12 @@ public class Marker extends Annotation { @Keep private LatLng position; private String snippet; - @Nullable private Icon icon; //Redundantly stored for JNI access - @Nullable @Keep private String iconId; private String title; - @Nullable private InfoWindow infoWindow; private boolean infoWindowShown; @@ -164,7 +161,6 @@ public class Marker extends Annotation { * * @return The {@link Icon} the marker is using. */ - @Nullable public Icon getIcon() { return icon; } @@ -216,7 +212,6 @@ public class Marker extends Annotation { * @param mapView The hosting map view. * @return The info window that was shown. */ - @Nullable public InfoWindow showInfoWindow(@NonNull MapboxMap mapboxMap, @NonNull MapView mapView) { setMapboxMap(mapboxMap); setMapView(mapView); @@ -238,14 +233,12 @@ public class Marker extends Annotation { return showInfoWindow(infoWindow, mapView); } - @NonNull private InfoWindow showInfoWindow(InfoWindow iw, MapView mapView) { iw.open(mapView, this, getPosition(), rightOffsetPixels, topOffsetPixels); infoWindowShown = true; return iw; } - @Nullable private InfoWindow getInfoWindow(@NonNull MapView mapView) { if (infoWindow == null && mapView.getContext() != null) { infoWindow = new InfoWindow(mapView, R.layout.mapbox_infowindow_content, getMapboxMap()); |