1 files changed, 9 insertions, 24 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java
index be71e58eba..82da905413 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/SymbolLayerActivity.java
@@ -5,9 +5,7 @@ import android.graphics.Color;
 import android.graphics.PointF;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -37,7 +35,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textFont;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textSize;
 
 /**
- * Example to test runtime manipulation of symbol layers
+ * Test activity showcasing runtime manipulation of symbol layers.
  */
 public class SymbolLayerActivity extends AppCompatActivity implements MapboxMap.OnMapClickListener {
 
@@ -51,15 +49,6 @@ public class SymbolLayerActivity extends AppCompatActivity implements MapboxMap.
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_symbollayer);
 
-    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() {
@@ -67,21 +56,21 @@ public class SymbolLayerActivity extends AppCompatActivity implements MapboxMap.
       public void onMapReady(@NonNull final MapboxMap map) {
         mapboxMap = map;
 
-        //Add a image for the makers
+        // Add a image for the makers
         mapboxMap.addImage(
           "my-marker-image",
           BitmapFactory.decodeResource(SymbolLayerActivity.this.getResources(),
             R.drawable.mapbox_marker_icon_default)
         );
 
-        //Add a source
+        // Add a source
         FeatureCollection markers = FeatureCollection.fromFeatures(new Feature[] {
           Feature.fromGeometry(Point.fromCoordinates(new double[] {4.91638, 52.35673}), featureProperties("Marker 1")),
           Feature.fromGeometry(Point.fromCoordinates(new double[] {4.91638, 52.34673}), featureProperties("Marker 2"))
         });
         mapboxMap.addSource(new GeoJsonSource(MARKER_SOURCE, markers));
 
-        //Add the symbol-layer
+        // Add the symbol-layer
         mapboxMap.addLayer(
           new SymbolLayer(MARKER_LAYER, MARKER_SOURCE)
             .withProperties(
@@ -93,10 +82,10 @@ public class SymbolLayerActivity extends AppCompatActivity implements MapboxMap.
             )
         );
 
-        //Show
+        // Show
         mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(52.35273, 4.91638), 14));
 
-        //Set a click-listener so we can manipulate the map
+        // Set a click-listener so we can manipulate the map
         mapboxMap.setOnMapClickListener(SymbolLayerActivity.this);
       }
     });
@@ -104,13 +93,13 @@ public class SymbolLayerActivity extends AppCompatActivity implements MapboxMap.
 
   @Override
   public void onMapClick(@NonNull LatLng point) {
-    //Query which features are clicked
+    // Query which features are clicked
     PointF screenLoc = mapboxMap.getProjection().toScreenLocation(point);
     List<Feature> features = mapboxMap.queryRenderedFeatures(screenLoc, MARKER_LAYER);
 
     SymbolLayer layer = mapboxMap.getLayerAs(MARKER_LAYER);
     if (features.size() == 0) {
-      //Reset
+      // Reset
       layer.setProperties(iconSize(1f));
     } else {
       layer.setProperties(iconSize(3f));
@@ -195,9 +184,6 @@ public class SymbolLayerActivity extends AppCompatActivity implements MapboxMap.
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
-      case android.R.id.home:
-        onBackPressed();
-        return true;
       case R.id.action_toggle_text_size:
         toggleTextSize();
         return true;
@@ -211,5 +197,4 @@ public class SymbolLayerActivity extends AppCompatActivity implements MapboxMap.
         return super.onOptionsItemSelected(item);
     }
   }
-
-}
\ No newline at end of file
+}