1 files changed, 10 insertions, 28 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java
index 0b102057b7..7628d6391e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CircleLayerActivity.java
@@ -5,13 +5,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-
-import timber.log.Timber;
-
-import android.view.MenuItem;
 import android.view.View;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
@@ -28,10 +22,18 @@ import com.mapbox.mapboxsdk.testapp.R;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import timber.log.Timber;
+
 import static com.mapbox.mapboxsdk.style.layers.Filter.in;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleColor;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleRadius;
 
+/**
+ * Test activity showcasing adding a Circle Layer to the Map
+ * <p>
+ * Uses bus stop data from Singapore as a source and allows to filter into 1 specific route with a line layer.
+ * </p>
+ */
 public class CircleLayerActivity extends AppCompatActivity {
 
   private static final String[] STOPS_FOR_ROUTE = new String[] {"99009", "99131", "99049", "99039", "99029", "99019",
@@ -50,15 +52,6 @@ public class CircleLayerActivity extends AppCompatActivity {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_circle_layer);
 
-    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-    setSupportActionBar(toolbar);
-
-    ActionBar actionBar = getSupportActionBar();
-    if (actionBar != null) {
-      actionBar.setDisplayHomeAsUpEnabled(true);
-      actionBar.setDisplayShowHomeEnabled(true);
-    }
-
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(new OnMapReadyCallback() {
@@ -87,7 +80,7 @@ public class CircleLayerActivity extends AppCompatActivity {
           public void onClick(View view) {
 
             // filter out stops for our route
-            layer.setFilter(in("number", STOPS_FOR_ROUTE));
+            layer.setFilter(in("number", (Object[]) STOPS_FOR_ROUTE));
 
             // add route as a line
             try {
@@ -98,7 +91,7 @@ public class CircleLayerActivity extends AppCompatActivity {
               Timber.e("That's not an url... ", malformedUrlException);
             }
             LineLayer lineLayer = new LineLayer("route_layer", "bus_route");
-            mapboxMap.addLayer(lineLayer, "stops_layer");
+            mapboxMap.addLayerBelow(lineLayer, "stops_layer");
 
             // move camera to start route
             mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(
@@ -156,15 +149,4 @@ public class CircleLayerActivity extends AppCompatActivity {
     super.onDestroy();
     mapView.onDestroy();
   }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        onBackPressed();
-        return true;
-      default:
-        return super.onOptionsItemSelected(item);
-    }
-  }
 }