Remove versioning data from AndroidManifest.xml.in

[fw/altos] / altosdroid / app / src / main / AndroidManifest.xml.in

diff --git a/altosdroid/app/src/main/AndroidManifest.xml.in b/altosdroid/app/src/main/AndroidManifest.xml.in
index 690f19908787c0b8f9e6086465d11d18d52ccf4d..566a7e582f494b074773312d7c95062c4a097f1f 100644 (file)
--- a/altosdroid/app/src/main/AndroidManifest.xml.in
+++ b/altosdroid/app/src/main/AndroidManifest.xml.in
@@ -19,10 +19,7 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.altusmetrum.AltosDroid"
-          android:versionCode="@ANDROID_VERSION@"
-          android:versionName="@VERSION@">
-    <uses-sdk android:targetSdkVersion="21" android:minSdkVersion="21"/>
+          package="org.altusmetrum.AltosDroid">
     <!-- Google Maps -->
     <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
 
@@ -53,23 +50,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"