X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2FAndroidManifest.xml;h=02507bb9b8afeb61dc41aef632e3ac099b3d93e3;hp=e976555ef0f092acab0109c6803616546da1ea64;hb=0e3b3ce66035e8a90fd708d9a4bc01370174c9eb;hpb=0f3597389977f86a8c1bdff1b7f46107c43ef306

diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml
index e976555e..02507bb9 100644
--- a/altosdroid/AndroidManifest.xml
+++ b/altosdroid/AndroidManifest.xml
@@ -16,17 +16,35 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.altusmetrum.AltosDroid"
-      android:versionCode="1"
-      android:versionName="1.0">
+          package="org.altusmetrum.AltosDroid"
+          android:versionCode="5"
+          android:versionName="1.3">
     <uses-sdk android:targetSdkVersion="10" android:minSdkVersion="10"/>
+    <!-- Google Maps -->
+    <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
+
+    <!-- Permissions needed to access bluetooth -->
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
+    <!-- Permissions needed to save Telemetry logs to SD card -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- Permissions needed for GoogleMaps -->
+    <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"/>
+
 
     <application android:label="@string/app_name"
-                 android:icon="@drawable/app_icon" >
-        <activity android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden" android:name="org.altusmetrum.AltosDroid.AltosDroid">
+                 android:icon="@drawable/app_icon"
+                 android:allowBackup="true" >
+        <activity android:name="org.altusmetrum.AltosDroid.AltosDroid"
+                  android:label="@string/app_name"
+                  android:configChanges="orientation|keyboardHidden" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -37,31 +55,11 @@
                   android:theme="@android:style/Theme.Dialog"
                   android:configChanges="orientation|keyboardHidden" />
 
-
-        <!-- Service Samples -->
-
         <service android:name=".TelemetryService" />
 
-        <activity android:name=".TelemetryServiceActivities$Controller"
-                android:label="@string/activity_telemetry_service_controller"
-                android:launchMode="singleTop">
-<!--
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
--->
-        </activity>
-
-        <activity android:name="TelemetryServiceActivities$Binding"
-                android:label="@string/activity_telemetry_service_binding">
-<!--
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
--->
-        </activity>
-
+        <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>