diff options
author | Tobrun <tobrun@mapbox.com> | 2016-05-20 11:25:14 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2016-05-20 12:03:27 +0200 |
commit | b962b56072255c818f441a2f0c8fbeb27e7f78bc (patch) | |
tree | 7edc9be44fcecb96659f643c441fc625b5d46906 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java | |
parent | d2fdf4a4ac7ae678e194dab2770724624fa33e79 (diff) | |
download | qtlocation-mapboxgl-b962b56072255c818f441a2f0c8fbeb27e7f78bc.tar.gz |
[android] #3276 - introduced separate methods for GL markers versus View markers
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java index 6212aade93..ab6504c636 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java @@ -3,15 +3,17 @@ package com.mapbox.mapboxsdk.annotations; import android.graphics.Point; import android.graphics.PointF; import android.os.Parcelable; +import android.support.annotation.AnimatorRes; +import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.geometry.LatLng; /** - * Abstract builder class for composing custom Marker objects. - * + * Abstract builder class for composing custom MarkerView objects. + * <p> * Extending this class requires implementing Parceable interface. * - * @param <U> Type of the marker to be composed + * @param <U> Type of the marker view to be composed * @param <T> Type of the builder to be used for composing a custom Marker */ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends BaseMarkerViewOptions<U, T>> implements Parcelable { @@ -31,7 +33,7 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base infoWindowOffset = new Point(); } - public T position(LatLng position) { + public T position(@NonNull LatLng position) { this.position = position; return getThis(); } @@ -66,12 +68,12 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base return getThis(); } - public T selectAnimRes(int selectAnimRes) { + public T selectAnimatorResource(@AnimatorRes int selectAnimRes) { this.selectAnimRes = selectAnimRes; return getThis(); } - public T deselectAnimRes(int deselectAnimRes) { + public T deselectAnimatorResource(@AnimatorRes int deselectAnimRes) { this.deselectAnimRes = deselectAnimRes; return getThis(); } |