diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 8e2041a12..5e07c105a 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java
index 71e2b8a88..ced82d1b8 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java
@@ -1,8 +1,12 @@
package com.mapbox.mapboxgl.testapp;
import android.os.Bundle;
+import android.support.v4.view.GravityCompat;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
import android.util.Log;
+import android.view.MenuItem;
+import android.view.View;
import com.mapbox.mapboxgl.views.MapView;
import java.io.BufferedReader;
import java.io.IOException;
@@ -20,6 +24,11 @@ public class SecondMapActivity extends AppCompatActivity {
setContentView(R.layout.activity_second);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.secondToolBar);
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ getSupportActionBar().setDisplayShowHomeEnabled(true);
+
mMapView = (MapView) findViewById(R.id.secondMapView);
// Load the access token
try {
@@ -80,4 +89,15 @@ public class SecondMapActivity extends AppCompatActivity {
mMapView.onLowMemory();
}
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ onBackPressed();
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
}
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_second.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_second.xml
index 74c1011b5..2ffda1daa 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_second.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_second.xml
@@ -4,6 +4,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
Mapbox GL
+ Second Activity
+
Toggle GPS location
Disable tracking
Use follow tracking mode