From 803d8bbd4e05eb6a1eb95ffdf47a49f747834d3c Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 9 Nov 2015 17:03:03 -0600 Subject: [PATCH] [android] #2931 - Making Manual Zoom Navigation Drawer Item Open Manual Zoom Activity --- .../MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml | 3 +++ .../main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java | 4 ++++ .../MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml | 1 + 3 files changed, 8 insertions(+) diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index bb7052c63..f01181fec 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -49,6 +49,9 @@ android:name=".PressForMarkerActivity" android:label="@string/activity_press_for_marker" /> + + diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java index 96384dc2b..6c44a9344 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java +++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java @@ -349,6 +349,10 @@ public class MainActivity extends AppCompatActivity { startActivity(new Intent(getApplicationContext(), PressForMarkerActivity.class)); return true; + case R.id.action_manual_zoom: + startActivity(new Intent(getApplicationContext(), ManualZoomActivity.class)); + return true; + case R.id.action_bulk_markers: startActivity(new Intent(getApplicationContext(), BulkMarkerActivity.class)); return true; diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index e27799019..5b3b28a02 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -8,6 +8,7 @@ Map Fragment Activity Press For Marker Activity Add Bulk Markers Activity + Manual Zoom Activity InfoWindow Activity Visible Coordinate Bounds User tracking mode