Merge branch 'release-boba' into masterupstream/fabian-merge-v4.0.0

# Conflicts:
#	circle.yml
#	include/mbgl/style/expression/let.hpp
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/gradle/dependencies.gradle
#	platform/android/src/example_custom_layer.cpp
#	platform/android/src/geojson/point.cpp
#	platform/darwin/src/NSPredicate+MGLAdditions.mm
#	platform/darwin/test/MGLExpressionTests.mm
#	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/ios/app/MBXViewController.m
#	src/mbgl/renderer/layers/render_custom_layer.cpp
#	src/mbgl/style/conversion/filter.cpp
#	src/mbgl/style/expression/interpolate.cpp
#	src/mbgl/style/expression/value.cpp
#	test/style/filter.test.cpp

1 files changed, 0 insertions, 106 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettingsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettingsTest.java
deleted file mode 100644
index c9ce19dc85..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettingsTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.mapbox.mapboxsdk.maps.widgets;
-
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-
-import com.mapbox.mapboxsdk.maps.FocalPointChangeListener;
-import com.mapbox.mapboxsdk.maps.Projection;
-import com.mapbox.mapboxsdk.maps.TrackingSettings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-
-import java.util.Arrays;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class MyLocationViewSettingsTest {
-
-  @InjectMocks
-  Projection projection = mock(Projection.class);
-
-  @InjectMocks
-  MyLocationView myLocationView = mock(MyLocationView.class);
-
-  @InjectMocks
-  TrackingSettings trackingSettings = mock(TrackingSettings.class);
-
-  @InjectMocks
-  FocalPointChangeListener focalPointChangeListener = mock(FocalPointChangeListener.class);
-
-  private MyLocationViewSettings locationViewSettings;
-
-  @Before
-  public void beforeTest() {
-    locationViewSettings = new MyLocationViewSettings(myLocationView, projection, focalPointChangeListener);
-  }
-
-  @Test
-  public void testSanity() {
-    assertNotNull("should not be null", locationViewSettings);
-  }
-
-  @Test
-  public void testForegroundDrawables() {
-    Drawable foregroundDrawable = mock(Drawable.class);
-    Drawable foregroundBearingDrawable = mock(Drawable.class);
-    Drawable.ConstantState constantState = mock(Drawable.ConstantState.class);
-    when(foregroundDrawable.getConstantState()).thenReturn(constantState);
-    when(constantState.newDrawable()).thenReturn(foregroundDrawable);
-    locationViewSettings.setForegroundDrawable(foregroundDrawable, foregroundBearingDrawable);
-    assertEquals("foreground should match", foregroundDrawable, locationViewSettings.getForegroundDrawable());
-    assertEquals("foreground bearing should match", foregroundBearingDrawable,
-      locationViewSettings.getForegroundBearingDrawable());
-  }
-
-  @Test
-  public void testBackgroundDrawable() {
-    Drawable backgroundDrawable = mock(Drawable.class);
-    int[] offset = new int[] {1, 2, 3, 4};
-    locationViewSettings.setBackgroundDrawable(backgroundDrawable, offset);
-    assertEquals("foreground should match", backgroundDrawable, locationViewSettings.getBackgroundDrawable());
-    assertTrue("offsets should match", Arrays.equals(offset, locationViewSettings.getBackgroundOffset()));
-  }
-
-  @Test
-  public void testForegroundTint() {
-    int color = Color.RED;
-    locationViewSettings.setForegroundTintColor(Color.RED);
-    assertEquals("color should match", color, locationViewSettings.getForegroundTintColor());
-  }
-
-  @Test
-  public void testForegroundTransparentTint() {
-    int color = Color.TRANSPARENT;
-    locationViewSettings.setForegroundTintColor(Color.TRANSPARENT);
-    assertEquals("color should match", color, locationViewSettings.getForegroundTintColor());
-  }
-
-  @Test
-  public void testBackgroundTint() {
-    int color = Color.RED;
-    locationViewSettings.setBackgroundTintColor(Color.RED);
-    assertEquals("color should match", color, locationViewSettings.getBackgroundTintColor());
-  }
-
-  @Test
-  public void testBackgroundTransparentTint() {
-    int color = Color.TRANSPARENT;
-    locationViewSettings.setBackgroundTintColor(Color.TRANSPARENT);
-    assertEquals("color should match", color, locationViewSettings.getBackgroundTintColor());
-  }
-
-  @Test
-  public void testEnabled() {
-    assertFalse("initial state should be false", locationViewSettings.isEnabled());
-    locationViewSettings.setEnabled(true);
-    assertTrue("state should be true", locationViewSettings.isEnabled());
-  }
-}
-