diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-26 22:38:14 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-27 17:47:02 +0200 |
| commit | 1f0820c8e82810fb957cb1cd17fb4327debfc0e5 (patch) | |
| tree | 976533b4a2b03ab033143ebcd013199222c7a9ca /android | |
| parent | 044e92f5e8ff2049702aa9ff6bbf4eecf9d86fa7 (diff) | |
| download | qtlocation-mapboxgl-1f0820c8e82810fb957cb1cd17fb4327debfc0e5.tar.gz | |
[core] Added MapDebugOptions
Map debug options are now cycled up to all debug options enabled, then
back to none.
Diffstat (limited to 'android')
4 files changed, 6 insertions, 6 deletions
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index c1b720cf27..dba17ece6a 100644 --- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java +++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -1330,8 +1330,8 @@ public final class MapView extends FrameLayout { * @see MapView#isDebugActive() */ @UiThread - public void toggleDebug() { - mNativeMapView.toggleDebug(); + public void cycleDebugOptions() { + mNativeMapView.cycleDebugOptions(); mNativeMapView.toggleCollisionDebug(); } diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java index dce90b64d6..d75b83cf8d 100644 --- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java +++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java @@ -401,7 +401,7 @@ final class NativeMapView { nativeSetDebug(mNativeMapViewPtr, debug); } - public void toggleDebug() { + public void cycleDebugOptions() { nativeToggleDebug(mNativeMapViewPtr); } 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 9995a15840..1c9d611145 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 @@ -322,8 +322,8 @@ public class MainActivity extends AppCompatActivity { switch (menuItem.getItemId()) { case R.id.action_debug: - // Toggle debug mode - mMapView.toggleDebug(); + // Cycle map debug options + mMapView.cycleDebugOptions(); toggleFpsCounter(mMapView.isDebugActive()); return true; diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 26b44060ea..b8277797ce 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -20,7 +20,7 @@ <string name="action_gps">Toggle GPS location</string> <string name="action_user_location_tracking">User location tracking</string> <string name="action_compass">Toggle compass</string> - <string name="action_debug">Toggle debug mode</string> + <string name="action_debug">Cycle map debug options</string> <string name="action_point_annotations">Toggle point annotations</string> <string name="action_info_window_adapter">InfoWindow Adapter</string> <string name="action_map_fragment">MapFragment</string> |