X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2FAndroidManifest.xml;h=592373d4131de0c39fc07daa61e96cc222f23c67;hb=4a33336b8f468c5b0f2e14c0ee0242c9a24a8b90;hp=04a679e1574823cb1e8b02eab7f604af282f8969;hpb=27afe30176051fca816d85c1be265ac663ef851c;p=fw%2Faltos

diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml
index 04a679e1..592373d4 100644
--- a/altosdroid/AndroidManifest.xml
+++ b/altosdroid/AndroidManifest.xml
@@ -17,9 +17,9 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.altusmetrum.AltosDroid"
-          android:versionCode="3"
-          android:versionName="1.2">
-    <uses-sdk android:targetSdkVersion="10" android:minSdkVersion="10"/>
+          android:versionCode="6"
+          android:versionName="1.5">
+    <uses-sdk android:targetSdkVersion="12" android:minSdkVersion="12"/>
     <!-- Google Maps -->
     <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
 
@@ -32,31 +32,61 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <permission android:name="org.altusmetrum.AltosDroid.permission.MAPS_RECEIVE"
                 android:protectionLevel="signature"/>
     <uses-permission android:name="org.altusmetrum.AltosDroid.permission.MAPS_RECEIVE"/>
 
+    <!-- Permissions needed to access USB OTG -->
+    <uses-feature android:name="android.hardware.usb.host" />
 
     <application android:label="@string/app_name"
                  android:icon="@drawable/app_icon"
-                 android:allowBackup="true" >
+                 android:allowBackup="true"
+		 android:theme="@style/CustomTheme">
         <activity android:name="org.altusmetrum.AltosDroid.AltosDroid"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden" >
+                  android:configChanges="orientation|keyboardHidden"
+		  android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+	<activity android:name="org.altusmetrum.AltosDroid.AltosDroid"
+                  android:configChanges="orientation|keyboardHidden"
+		  android:launchMode="singleTop">
+	  <intent-filter>
+	    <action
+		android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
+	  </intent-filter>
+	  <meta-data
+	      android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+	      android:resource="@xml/device_filter" />
+	</activity>
+
         <activity android:name=".DeviceListActivity"
                   android:label="@string/select_device"
                   android:theme="@android:style/Theme.Dialog"
                   android:configChanges="orientation|keyboardHidden" />
 
+        <activity android:name=".PreloadMapActivity"
+                  android:label="@string/preload_maps"
+                  android:theme="@android:style/Theme.Dialog"
+                  android:configChanges="orientation|keyboardHidden" />
+
+        <activity android:name=".MapTypeActivity"
+                  android:label="@string/map_type"
+                  android:theme="@android:style/Theme.Dialog"
+                  android:configChanges="orientation|keyboardHidden" />
+
         <service android:name=".TelemetryService" />
 
         <meta-data android:name="com.google.android.maps.v2.API_KEY"
                    android:value="AIzaSyDSr6u4i9TJmVGhgGk4g0wUUhTy9FGyn0s"/>
+        <meta-data android:name="com.google.android.gms.version"
+                   android:value="@integer/google_play_services_version" />
     </application>
 </manifest>