X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2FAndroidManifest.xml.in;h=d237af4d3edbe62be52b44196f76ca1e032f9c56;hb=6e3c4493cfa8d92d96808d14d1c12abb35ecb442;hp=690f19908787c0b8f9e6086465d11d18d52ccf4d;hpb=8b53f860eb3171cd43e4bd0e440f2889bd810662;p=fw%2Faltos

diff --git a/altosdroid/app/src/main/AndroidManifest.xml.in b/altosdroid/app/src/main/AndroidManifest.xml.in
index 690f1990..d237af4d 100644
--- a/altosdroid/app/src/main/AndroidManifest.xml.in
+++ b/altosdroid/app/src/main/AndroidManifest.xml.in
@@ -19,13 +19,12 @@
 
 -->
 <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"/>
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
     <!-- Permissions needed to access bluetooth -->
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
@@ -47,29 +46,23 @@
     <application android:label="@string/app_name"
                  android:icon="@drawable/app_icon"
                  android:allowBackup="true"
-		 android:theme="@style/CustomTheme">
+                 android:theme="@style/Medium">
+
         <activity android:name="org.altusmetrum.AltosDroid.AltosDroid"
                   android:label="@string/app_name"
                   android:configChanges="orientation|keyboardHidden"
-		  android:launchMode="singleTop">
+                  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"
@@ -95,13 +88,13 @@
                   android:theme="@android:style/Theme.Dialog"
                   android:configChanges="orientation|keyboardHidden" />
 
-	<activity android:name=".SetupActivity"
-		  android:label="@string/setup"
+        <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"
+
+        <activity android:name=".ManageFrequenciesActivity"
+                  android:label="@string/manage_frequencies"
                   android:theme="@android:style/Theme.Dialog"
                   android:configChanges="orientation|keyboard" />