1 files changed, 11 insertions, 31 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
index 8e4b58366f..dde22db2db 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.java
@@ -3,12 +3,7 @@ package com.mapbox.mapboxsdk.testapp.activity.customlayer;
 import android.os.Bundle;
 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.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -19,10 +14,15 @@ import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.style.layers.CustomLayer;
-import com.mapbox.mapboxsdk.style.layers.NoSuchLayerException;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.model.customlayer.ExampleCustomLayer;
 
+/**
+ * Test activity showcasing the Custom Layer API
+ * <p>
+ * Note: experimental API, do not use.
+ * </p>
+ */
 public class CustomLayerActivity extends AppCompatActivity {
 
   private MapboxMap mapboxMap;
@@ -36,8 +36,6 @@ public class CustomLayerActivity extends AppCompatActivity {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_custom_layer);
 
-    setupActionBar();
-
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(new OnMapReadyCallback() {
@@ -63,21 +61,17 @@ public class CustomLayerActivity extends AppCompatActivity {
 
   private void swapCustomLayer() {
     if (customLayer != null) {
-      try {
-        mapboxMap.removeLayer(customLayer.getId());
-        customLayer = null;
-      } catch (NoSuchLayerException noSuchLayerException) {
-        Timber.e("No custom layer to remove");
-      }
-      fab.setImageResource(R.drawable.ic_layers_24dp);
+      mapboxMap.removeLayer(customLayer);
+      customLayer = null;
+      fab.setImageResource(R.drawable.ic_layers);
     } else {
       customLayer = new CustomLayer("custom",
         ExampleCustomLayer.createContext(),
         ExampleCustomLayer.InitializeFunction,
         ExampleCustomLayer.RenderFunction,
         ExampleCustomLayer.DeinitializeFunction);
-      mapboxMap.addLayer(customLayer, "building");
-      fab.setImageResource(R.drawable.ic_layers_clear_24dp);
+      mapboxMap.addLayerBelow(customLayer, "building");
+      fab.setImageResource(R.drawable.ic_layers_clear);
     }
   }
 
@@ -138,9 +132,6 @@ public class CustomLayerActivity extends AppCompatActivity {
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
-      case android.R.id.home:
-        onBackPressed();
-        return true;
       case R.id.action_update_layer:
         updateLayer();
         return true;
@@ -157,15 +148,4 @@ public class CustomLayerActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
   }
-
-  private void setupActionBar() {
-    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-    setSupportActionBar(toolbar);
-
-    final ActionBar actionBar = getSupportActionBar();
-    if (actionBar != null) {
-      actionBar.setDisplayHomeAsUpEnabled(true);
-      actionBar.setDisplayShowHomeEnabled(true);
-    }
-  }
 }