diff options
| author | clydebarrow <github@cps.sr20.org> | 2016-10-04 18:13:02 +1100 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2016-10-05 17:10:45 +0200 |
| commit | a4b0e2f30c38986aedc2dc728adbd383912f4bee (patch) | |
| tree | d8b2be2482e4bdfa0b3751232765b08d4b878077 /platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu | |
| parent | 214ec4e96ad71d8ffefe1c12292ec77b58bd3fb2 (diff) | |
| download | qtlocation-mapboxgl-a4b0e2f30c38986aedc2dc728adbd383912f4bee.tar.gz | |
[android] Revise handling of tracking modes and interactions
with touch gestures.
This fixes issues #6549 and #6567. Also pertinent to #6557.
Additional code has been added to the test app (Activity "User Tracking
Mode") to test.
A potential race condition in the MapboxMap#easeCamera() methods where
a camera change generated by tracking which could have reset the tracking
modes has been eliminated by factoring out a new method
MapboxMap#easeCameraInternal().
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml index dc2add474c..91424d3f5b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml @@ -4,7 +4,7 @@ <group android:checkableBehavior="all"> <item - android:id="@+id/action_toggle_dismissible_tracking" + android:id="@+id/action_toggle_dismissible_location" android:checkable="true" android:checked="false" android:title="@string/menuitem_title_tracking_mode_dismiss_on_gesture" @@ -15,6 +15,18 @@ android:checked="false" android:title="@string/menuitem_title_bearing_mode_dismiss_on_gesture" app:showAsAction="never" /> + <item + android:id="@+id/action_toggle_rotate_gesture_enabled" + android:checkable="true" + android:checked="false" + android:title="@string/menuitem_title_rotate_gesture_enabled" + app:showAsAction="never" /> + <item + android:id="@+id/action_toggle_scroll_gesture_enabled" + android:checkable="true" + android:checked="false" + android:title="@string/menuitem_title_scroll_gesture_enabled" + app:showAsAction="never" /> </group> </menu>
\ No newline at end of file |