summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorTobrun Van Nuland <tobrun.van.nuland@gmail.com>2016-07-13 11:05:39 +0200
committerTobrun Van Nuland <tobrun.van.nuland@gmail.com>2016-07-13 16:43:01 +0200
commitb9c273d19713f9712dc06c90364fc78224fac351 (patch)
tree51b9418b4ce4e69add3ac5c9226f700fbe946600 /platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
parent9387523376fc6154dda58698fd743150c32858b4 (diff)
downloadqtlocation-mapboxgl-b9c273d19713f9712dc06c90364fc78224fac351.tar.gz
[android] #5649 - add a ViewPager example
[android] #5649 - add back pressed event for action bar home icon
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml')
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml31
1 files changed, 21 insertions, 10 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 40d980b6ec..b1d7249a04 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:name=".MapboxApplication"
@@ -47,7 +47,7 @@
android:label="@string/activity_dynamic_infowindow_adapter">
<meta-data
android:name="@string/category"
- android:value="@string/category_infowindow"/>
+ android:value="@string/category_infowindow" />
</activity>
<activity
android:name=".activity.annotation.BulkMarkerActivity"
@@ -74,9 +74,10 @@
android:name="@string/category"
android:value="@string/category_annotation" />
</activity>
- <activity android:name=".activity.annotation.PressForMarkerActivity"
- android:description="@string/description_press_for_marker"
- android:label="@string/activity_press_for_marker">
+ <activity
+ android:name=".activity.annotation.PressForMarkerActivity"
+ android:description="@string/description_press_for_marker"
+ android:label="@string/activity_press_for_marker">
<meta-data
android:name="@string/category"
android:value="@string/category_annotation" />
@@ -100,8 +101,8 @@
<activity
android:name=".activity.camera.LatLngBoundsActivity"
android:description="@string/description_visible_bounds"
- android:screenOrientation="portrait"
- android:label="@string/activity_visible_coordinate_bounds">
+ android:label="@string/activity_visible_coordinate_bounds"
+ android:screenOrientation="portrait">
<meta-data
android:name="@string/category"
android:value="@string/category_camera" />
@@ -278,14 +279,24 @@
android:value="@string/category_annotation" />
</activity>
- <activity android:name=".activity.navigation.LocationPickerActivity"
- android:description="@string/description_location_picker"
- android:label="@string/activity_location_picker">
+ <activity
+ android:name=".activity.navigation.LocationPickerActivity"
+ android:description="@string/description_location_picker"
+ android:label="@string/activity_location_picker">
<meta-data
android:name="@string/category"
android:value="@string/category_navigation" />
</activity>
+ <activity
+ android:name=".activity.fragment.ViewPagerActivity"
+ android:description="@string/description_viewpager"
+ android:label="@string/activity_viewpager">
+ <meta-data
+ android:name="@string/category"
+ android:value="@string/category_fragment" />
+ </activity>
+
<!-- Configuration Settings -->
<meta-data
android:name="com.mapbox.TestEventsServer"