diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
index e79a75fca..b45e891dc 100644
--- a/app/src/androidTest/AndroidManifest.xml
+++ b/app/src/androidTest/AndroidManifest.xml
@@ -1,18 +1,24 @@
+
+ xmlns:tools="http://schemas.android.com/tools"
+ package="org.fdroid.fdroid.tests"
+ android:versionCode="1"
+ android:versionName="1.0">
+
+
-
-
-
+
+
+
+
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 9a241f133..7387a300a 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -1,7 +1,8 @@
+
-
+
diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 6593e0f3b..305c3c707 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -1,4 +1,5 @@
+
+ package="org.fdroid.fdroid"
+ android:installLocation="auto">
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:name=".nearby.SwapWorkflowActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:label="@string/swap"
+ android:launchMode="singleTask"
+ android:parentActivityName=".views.main.MainActivity"
+ android:screenOrientation="portrait">
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value=".views.main.MainActivity" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
+
+ android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+ android:resource="@xml/device_filter" />
-
+
-
+
+ android:name="android.hardware.usb.action.USB_DEVICE_DETACHED"
+ android:resource="@xml/device_filter" />
@@ -120,51 +159,20 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98695de24..4b62ea827 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
+
+ xmlns:tools="http://schemas.android.com/tools"
+ package="org.fdroid.fdroid"
+ android:installLocation="auto">
+ android:anyDensity="true"
+ android:largeScreens="true"
+ android:normalScreens="true"
+ android:resizeable="true"
+ android:smallScreens="true"
+ android:xlargeScreens="true" />
+ android:name="android.hardware.telephony"
+ android:required="false" />
-
+ android:name="android.hardware.wifi"
+ android:required="false" />
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:name=".FDroidApp"
+ android:allowBackup="true"
+ android:description="@string/app_description"
+ android:fullBackupContent="@xml/backup_rules"
+ android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:networkSecurityConfig="@xml/network_security_config"
+ android:supportsRtl="true"
+ android:theme="@style/Theme.App">
+ android:name=".privileged.views.InstallConfirmActivity"
+ android:configChanges="layoutDirection|locale"
+ android:excludeFromRecents="true"
+ android:label="@string/menu_install"
+ android:parentActivityName=".views.main.MainActivity">
-
-
-
-
-
-
-
-
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value=".views.main.MainActivity" />
+ android:name=".privileged.views.UninstallDialogActivity"
+ android:excludeFromRecents="true" />
+
+
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value=".views.main.MainActivity" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:name=".NfcNotEnabledActivity"
+ android:configChanges="layoutDirection|locale"
+ android:noHistory="true" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -429,11 +364,11 @@
This filter supports HTTP and HTTPS schemes. There is an additional filter for
fdroidrepo:// and fdroidrepos://
-->
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
-
-
-
-
-
+ android:name="android.app.searchable"
+ android:resource="@xml/searchable" />
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+