#1940 -Adding menu item controls for compass on / off. Removing locat…

…ion_marker assets from App as they're now only in the SDK.
mapbox · Aug 5, 2015 · c84a6fb · c84a6fb
1 parent 6e04804
commit c84a6fb
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 0 deletions.
diff --git a/...ava/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/...ava/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
@@ -247,6 +247,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_markers:
                 // Toggle markers
                 toggleMarkers(!mIsMarkersOn);
+                return true;
+
+            case R.id.action_compass:
+                // Toggle compass
+                mapView.setCompassEnabled(!mapView.isCompassEnabled());
+                return true;
 
             default:
                 return super.onOptionsItemSelected(item);

diff --git a/.../MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_explore_white_24dp.png b/.../MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_explore_white_24dp.png
diff --git a/...d/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/location_marker.png b/...d/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/location_marker.png
diff --git a/...d/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/location_marker.png b/...d/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-ldpi/location_marker.png
diff --git a/.../MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_explore_white_24dp.png b/.../MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_explore_white_24dp.png
diff --git a/...d/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/location_marker.png b/...d/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/location_marker.png
diff --git a/...MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_explore_white_24dp.png b/...MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_explore_white_24dp.png
diff --git a/.../java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/location_marker.png b/.../java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/location_marker.png
diff --git a/...apboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_explore_white_24dp.png b/...apboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_explore_white_24dp.png
diff --git a/...java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/location_marker.png b/...java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/location_marker.png
diff --git a/...pboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_explore_white_24dp.png b/...pboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_explore_white_24dp.png
diff --git a/...ava/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/location_marker.png b/...ava/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/location_marker.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml
@@ -12,4 +12,8 @@
           android:icon="@drawable/ic_action_location_searching"
           android:title="@string/action_gps"
           app:showAsAction="ifRoom" />
+    <item android:id="@+id/action_compass"
+          android:icon="@drawable/ic_explore_white_24dp"
+          android:title="@string/action_compass"
+          app:showAsAction="ifRoom"/>
 </menu>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_name">Mapbox GL</string>
 
     <string name="action_gps">Toggle GPS location</string>
+    <string name="action_compass">Toggle Compass</string>
 
     <string name="action_debug">Toggle debug mode</string>