summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Beattie <mike@ethernal.org>2019-09-19 10:16:18 +1200
committerMike Beattie <mike@ethernal.org>2019-09-19 10:16:18 +1200
commit198c868a25b3cbcde9634bbbcce57d71f3659eee (patch)
tree5c23793a5e6cd2305da4f42d9ecdd324f6896f29
parent1ba8ffe41defe411390197c56b03762fa51c20bf (diff)
Clean up duplication in AndroidManifest.xml.in
Signed-off-by: Mike Beattie <mike@ethernal.org>
-rw-r--r--altosdroid/app/src/main/AndroidManifest.xml.in19
1 files changed, 6 insertions, 13 deletions
diff --git a/altosdroid/app/src/main/AndroidManifest.xml.in b/altosdroid/app/src/main/AndroidManifest.xml.in
index 690f1990..5fa07bac 100644
--- a/altosdroid/app/src/main/AndroidManifest.xml.in
+++ b/altosdroid/app/src/main/AndroidManifest.xml.in
@@ -53,23 +53,16 @@
android:configChanges="orientation|keyboardHidden"
android:launchMode="singleTop">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.VIEW" />
+ <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="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"