diff options
| author | Keith Packard <keithp@keithp.com> | 2013-03-07 13:00:44 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-03-07 13:00:44 -0800 |
| commit | 84d35e4cbd7ea2f681c43496b9b9db84f9dd923f (patch) | |
| tree | cc3c34793dbb8c91377ea2cc93cfb4e3a52cee21 /altosdroid/AndroidManifest.xml | |
| parent | 760b1f02c178c600226f39b5e66d8cbadbf4a29b (diff) | |
| parent | e0d9128b7219b4c8ee68245a44b3428e796ca2f1 (diff) | |
Merge remote-tracking branch 'mjb/altosdroid'
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 8ecfcbb5..237c6dcf 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -16,18 +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.1.9.3"> + package="org.altusmetrum.AltosDroid" + android:versionCode="1" + android:versionName="1.1.9.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_COARSE_LOCATION"/> + <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" /> @@ -38,9 +55,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> |