diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-04-04 11:03:14 +0200 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2016-04-05 11:51:08 -0500 |
| commit | 63780d07f3af392338ae88f53fea726195c9c7ff (patch) | |
| tree | 7e08a980685d3b7f221e18394fbe99a6b7c73838 /platform/android/MapboxGLAndroidSDKTestApp/src/main/res | |
| parent | cda5884aa0fd9b637276b1cb5aebcbffbcdaab29 (diff) | |
| download | qtlocation-mapboxgl-63780d07f3af392338ae88f53fea726195c9c7ff.tar.gz | |
[android] #4365 - make dismiss on gesture configurable, renamed activity to match UI in test app, cleanup
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res')
3 files changed, 22 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml index 9341648639..5a5fb5f604 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml @@ -21,12 +21,11 @@ app:center_longitude="-0.11968" app:zoom="15" /> - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" android:layout_alignParentBottom="true" + android:orientation="horizontal" android:weightSum="3"> <Button @@ -51,5 +50,4 @@ android:text="@string/button_camera_animate" /> </LinearLayout> - </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml new file mode 100644 index 0000000000..25c77fcc2b --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <group android:checkableBehavior="all"> + <item + android:id="@+id/action_toggle_dismissible_tracking" + android:checkable="true" + android:checked="true" + android:title="@string/menuitem_title_tracking_mode_dismiss_on_gesture" + app:showAsAction="never" /> + </group> + +</menu>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 4510db4148..5ceabacff2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -67,13 +67,14 @@ <string name="description_snapshot">Example to make a snapshot of the map</string> <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string>r + <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss on Gesture</string>r <string name="category">category</string> <string name="category_annotation">Annotation</string> <string name="category_infowindow">InfoWindow</string> <string name="category_camera">Camera</string> <string name="category_fragment">Fragment</string> - <string name="category_api">Mapbox Android Services</string> + <string name="category_api">API</string> <string name="category_other">Other</string> <string name="action_visible_bounds_explanation">Center map around 2 markers</string> @@ -106,14 +107,14 @@ </string-array> <string-array name="user_tracking_mode"> - <item>Disable tracking</item> - <item>Follow tracking mode</item> + <item>Disabled</item> + <item>Follow tracking</item> </string-array> <string-array name="user_bearing_mode"> - <item>Disable bearing</item> - <item>GPS mode</item> - <item>Compass mode</item> + <item>Disabled</item> + <item>GPS bearing</item> + <item>Compass bearing</item> <!--<item>Combined mode</item>--> </string-array> |