diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-05-06 18:13:12 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-05-06 18:13:12 -0600 |
| commit | 4c20fdfa543059739b756171b991d430789cded1 (patch) | |
| tree | f39e6c729364211bf0570c459c37b576ecf9faa9 /altosdroid/AndroidManifest.xml.in | |
| parent | e58dd78bcb749315f84168c83a74cf80851bf815 (diff) | |
| parent | 2f0c977c747824d0798550ac64eceb1d66c50efd (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'altosdroid/AndroidManifest.xml.in')
| -rw-r--r-- | altosdroid/AndroidManifest.xml.in | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/altosdroid/AndroidManifest.xml.in b/altosdroid/AndroidManifest.xml.in index 24035796..2644d747 100644 --- a/altosdroid/AndroidManifest.xml.in +++ b/altosdroid/AndroidManifest.xml.in @@ -39,7 +39,7 @@ <uses-permission android:name="org.altusmetrum.AltosDroid.permission.MAPS_RECEIVE"/> <!-- Permissions needed to access USB OTG --> - <uses-feature android:name="android.hardware.usb.host" /> + <uses-feature android:name="android.hardware.usb.host" android:required="false" /> <application android:label="@string/app_name" android:icon="@drawable/app_icon" @@ -82,10 +82,30 @@ android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden" /> + <activity android:name=".IdleModeActivity" + android:label="@string/idle_mode" + android:theme="@android:style/Theme.Dialog" + android:configChanges="orientation|keyboardHidden" /> + + <activity android:name=".IgniterActivity" + android:label="@string/igniters" + android:theme="@android:style/Theme.Dialog" + android:configChanges="orientation|keyboardHidden" /> + + <activity android:name=".SetupActivity" + android:label="@string/setup" + android:theme="@android:style/Theme.Dialog" + android:configChanges="orientation" /> + + <activity android:name=".ManageFrequenciesActivity" + android:label="@string/manage_frequencies" + android:theme="@android:style/Theme.Dialog" + android:configChanges="orientation|keyboard" /> + <service android:name=".TelemetryService" /> <meta-data android:name="com.google.android.maps.v2.API_KEY" - android:value="AIzaSyDSr6u4i9TJmVGhgGk4g0wUUhTy9FGyn0s"/> + android:value="@GOOGLEKEY@"/> <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" /> </application> |