From: Mike Beattie <mike@ethernal.org>
Date: Wed, 18 Sep 2019 22:16:18 +0000 (+1200)
Subject: Clean up duplication in AndroidManifest.xml.in
X-Git-Tag: 1.9.1~1^2~37^2~8
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=198c868a25b3cbcde9634bbbcce57d71f3659eee;hp=1ba8ffe41defe411390197c56b03762fa51c20bf;p=fw%2Faltos

Clean up duplication in AndroidManifest.xml.in

Signed-off-by: Mike Beattie <mike@ethernal.org>
---

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"