summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorclydebarrow <github@cps.sr20.org>2016-10-04 18:13:02 +1100
committerTobrun <tobrun.van.nuland@gmail.com>2016-10-05 17:10:45 +0200
commita4b0e2f30c38986aedc2dc728adbd383912f4bee (patch)
treed8b2be2482e4bdfa0b3751232765b08d4b878077 /platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
parent214ec4e96ad71d8ffefe1c12292ec77b58bd3fb2 (diff)
downloadqtlocation-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/values/strings.xml')
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 128ac715ad..83160feb5b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -221,5 +221,7 @@
<string name="action_example">Example action</string>
<string name="action_settings">Settings</string>
+ <string name="menuitem_title_rotate_gesture_enabled">Enable rotate gestures</string>
+ <string name="menuitem_title_scroll_gesture_enabled">Enable scroll gestures</string>
</resources>