diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-05-16 00:36:23 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-05-16 00:36:23 -0600 |
| commit | 02d111b1b53ef01fc6e9ab6c4bc60b8af1be0067 (patch) | |
| tree | 8356f4a019969ee99a45e264c87d38555cf316cc /altosdroid/AndroidManifest.xml | |
| parent | 7a2e1f05adad990a6b161865267abf07ffec7a7e (diff) | |
| parent | 7699a55aed3a9a7daeb4c6a5a9a280f43edf455f (diff) | |
Merge branch 'branch-1.2' into debian
Diffstat (limited to 'altosdroid/AndroidManifest.xml')
| -rw-r--r-- | altosdroid/AndroidManifest.xml | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index 12391759..04a679e1 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -16,17 +16,34 @@ * 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="3" + android:versionName="1.2"> <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"/> + + <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,9 +54,9 @@ 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"/> </application> </manifest> |