summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-11-09 17:03:03 -0600
committerAdam Hunter <adam@mapbox.com>2015-11-13 16:52:58 -0800
commit803d8bbd4e05eb6a1eb95ffdf47a49f747834d3c (patch)
tree8994507f7005afe59120e24d13757b87d4fe53c7 /android
parent69a2b06e210bdba41d837d2a74e072cdfbf63020 (diff)
downloadqtlocation-mapboxgl-803d8bbd4e05eb6a1eb95ffdf47a49f747834d3c.tar.gz
[android] #2931 - Making Manual Zoom Navigation Drawer Item Open Manual Zoom Activity
Diffstat (limited to 'android')
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml3
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java4
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml1
3 files changed, 8 insertions, 0 deletions
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index bb7052c631..f01181feca 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" />
+ <activity android:name=".ManualZoomActivity"
+ android:label="@string/action_manual_zoom"/>
+
<activity
android:name=".MyLocationTrackingModeActivity"
android:label="@string/activity_user_tracking_mode" />
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 96384dc2b9..6c44a9344d 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 e27799019c..5b3b28a022 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -8,6 +8,7 @@
<string name="activity_map_fragment">Map Fragment Activity</string>
<string name="activity_press_for_marker">Press For Marker Activity</string>
<string name="activity_marker_in_bulk">Add Bulk Markers Activity</string>
+ <string name="activity_manual_zoom">Manual Zoom Activity</string>
<string name="activity_info_window">InfoWindow Activity</string>
<string name="activity_visible_coordinate_bounds">Visible Coordinate Bounds</string>
<string name="activity_user_tracking_mode">User tracking mode</string>