From e9d15b46d8ed11452efe9fbe6a06f2c0a02d09c4 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 14 Sep 2022 16:50:11 +0100
Subject: [PATCH] lifting the activity alias entry to the application module -
 fixes the androidTests expecting a shortcuts xml

---
 vector-app/src/main/AndroidManifest.xml | 18 ++++++++++++++++++
 vector/src/main/AndroidManifest.xml     | 17 -----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/vector-app/src/main/AndroidManifest.xml b/vector-app/src/main/AndroidManifest.xml
index 84607cf3d7..bff594c0de 100644
--- a/vector-app/src/main/AndroidManifest.xml
+++ b/vector-app/src/main/AndroidManifest.xml
@@ -18,6 +18,24 @@
         tools:ignore="UnusedAttribute"
         tools:replace="android:allowBackup">
 
+        <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
+        <!-- exported="true" is required to launch application -->
+        <activity-alias
+            android:name=".features.Alias"
+            android:exported="true"
+            android:targetActivity="im.vector.app.features.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity-alias>
+
+
         <!-- Providers -->
 
         <!-- Remove WorkManagerInitializer Provider because we are using on-demand initialization of WorkManager-->
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 94f2abe78b..d60620dddf 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -90,23 +90,6 @@
             android:name=".features.MainActivity"
             android:theme="@style/Theme.Vector.Launcher" />
 
-        <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
-        <!-- exported="true" is required to launch application -->
-        <activity-alias
-            android:name=".features.Alias"
-            android:exported="true"
-            android:targetActivity=".features.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
-        </activity-alias>
-
         <activity android:name=".features.home.HomeActivity" />
 
         <activity