1 files changed, 5 insertions, 15 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java
index b5bcf188ae..c58cc310a8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java
@@ -5,7 +5,6 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.widget.LinearLayout;
@@ -18,7 +17,6 @@ import com.mapbox.mapboxsdk.R;
 public class BubbleLayout extends LinearLayout {
 
   public static final float DEFAULT_STROKE_WIDTH = -1;
-  @NonNull
   private ArrowDirection arrowDirection;
   private float arrowWidth;
   private float arrowHeight;
@@ -34,7 +32,7 @@ public class BubbleLayout extends LinearLayout {
    *
    * @param context The context used to inflate this bubble layout
    */
-  public BubbleLayout(@NonNull Context context) {
+  public BubbleLayout(Context context) {
     this(context, null, 0);
   }
 
@@ -44,7 +42,7 @@ public class BubbleLayout extends LinearLayout {
    * @param context The context used to inflate this bubble layout
    * @param attrs   The attribute set to initialise this bubble layout from
    */
-  public BubbleLayout(@NonNull Context context, AttributeSet attrs) {
+  public BubbleLayout(Context context, AttributeSet attrs) {
     this(context, attrs, 0);
   }
 
@@ -55,7 +53,7 @@ public class BubbleLayout extends LinearLayout {
    * @param attrs        The attribute set to initialise this bubble layout from
    * @param defStyleAttr The default style to apply this bubble layout with
    */
-  public BubbleLayout(@NonNull Context context, AttributeSet attrs, int defStyleAttr) {
+  public BubbleLayout(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
 
     TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.mapbox_BubbleLayout);
@@ -86,7 +84,7 @@ public class BubbleLayout extends LinearLayout {
   }
 
   @Override
-  protected void dispatchDraw(@NonNull Canvas canvas) {
+  protected void dispatchDraw(Canvas canvas) {
     if (bubble != null) {
       bubble.draw(canvas);
     }
@@ -113,8 +111,7 @@ public class BubbleLayout extends LinearLayout {
    * @param arrowDirection The direction of the arrow
    * @return this
    */
-  @NonNull
-  public BubbleLayout setArrowDirection(@NonNull ArrowDirection arrowDirection) {
+  public BubbleLayout setArrowDirection(ArrowDirection arrowDirection) {
     resetPadding();
     this.arrowDirection = arrowDirection;
     initPadding();
@@ -136,7 +133,6 @@ public class BubbleLayout extends LinearLayout {
    * @param arrowWidth The width of the arrow
    * @return this
    */
-  @NonNull
   public BubbleLayout setArrowWidth(float arrowWidth) {
     resetPadding();
     this.arrowWidth = arrowWidth;
@@ -159,7 +155,6 @@ public class BubbleLayout extends LinearLayout {
    * @param arrowHeight The height of the arrow
    * @return this
    */
-  @NonNull
   public BubbleLayout setArrowHeight(float arrowHeight) {
     resetPadding();
     this.arrowHeight = arrowHeight;
@@ -182,7 +177,6 @@ public class BubbleLayout extends LinearLayout {
    * @param arrowPosition The arrow position
    * @return this
    */
-  @NonNull
   public BubbleLayout setArrowPosition(float arrowPosition) {
     resetPadding();
     this.arrowPosition = arrowPosition;
@@ -205,7 +199,6 @@ public class BubbleLayout extends LinearLayout {
    * @param cornersRadius The corner radius
    * @return this
    */
-  @NonNull
   public BubbleLayout setCornersRadius(float cornersRadius) {
     this.cornersRadius = cornersRadius;
     requestLayout();
@@ -227,7 +220,6 @@ public class BubbleLayout extends LinearLayout {
    * @param bubbleColor The buble color
    * @return this
    */
-  @NonNull
   public BubbleLayout setBubbleColor(int bubbleColor) {
     this.bubbleColor = bubbleColor;
     requestLayout();
@@ -249,7 +241,6 @@ public class BubbleLayout extends LinearLayout {
    * @param strokeWidth The stroke width
    * @return this
    */
-  @NonNull
   public BubbleLayout setStrokeWidth(float strokeWidth) {
     resetPadding();
     this.strokeWidth = strokeWidth;
@@ -272,7 +263,6 @@ public class BubbleLayout extends LinearLayout {
    * @param strokeColor The stroke color
    * @return this
    */
-  @NonNull
   public BubbleLayout setStrokeColor(int strokeColor) {
     this.strokeColor = strokeColor;
     requestLayout();