diff options
Diffstat (limited to 'android')
4 files changed, 31 insertions, 1 deletions
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index 8e2041a129..5e07c105a2 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity android:name=".SecondMapActivity"/> + <activity android:name=".SecondMapActivity" android:label="@string/activity_second"/> <meta-data android:name="io.fabric.ApiKey" android:value="9724157045ff7d083492c6d9ae03e60e8609d461" /> 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 71e2b8a884..ced82d1b86 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 74c1011b5d..2ffda1daa2 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"> + <android.support.v7.widget.Toolbar + android:id="@+id/secondToolBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/primary" + android:minHeight="?attr/actionBarSize" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/> + <com.mapbox.mapboxgl.views.MapView android:id="@+id/secondMapView" android:layout_width="match_parent" diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 765f4d1962..836951cc58 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -3,6 +3,8 @@ <string name="app_name">Mapbox GL</string> + <string name="activity_second">Second Activity</string> + <string name="action_gps">Toggle GPS location</string> <string name="action_location_none">Disable tracking</string> <string name="action_location_follow">Use follow tracking mode</string> |