From 95e06762daa2453f26f036323fe59ad23259c58e Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Mon, 6 Dec 2021 21:48:41 +0100
Subject: [PATCH] Move debug_shortcuts meta to main AndroidManifest

---
 ui/src/debug/AndroidManifest.xml             | 15 ---------------
 ui/src/debug/res/xml-v25/debug_shortcuts.xml | 13 -------------
 ui/src/main/AndroidManifest.xml              |  5 +++++
 ui/src/main/res/xml-v25/debug_shortcuts.xml  |  2 ++
 4 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 ui/src/debug/AndroidManifest.xml
 delete mode 100644 ui/src/debug/res/xml-v25/debug_shortcuts.xml
 create mode 100644 ui/src/main/res/xml-v25/debug_shortcuts.xml

diff --git a/ui/src/debug/AndroidManifest.xml b/ui/src/debug/AndroidManifest.xml
deleted file mode 100644
index e72f1516..00000000
--- a/ui/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.ui">
-
-    <application>
-        <activity android:name=".legacy.activity.LauncherActivity">
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/debug_shortcuts" />
-
-        </activity>
-
-    </application>
-
-</manifest>
diff --git a/ui/src/debug/res/xml-v25/debug_shortcuts.xml b/ui/src/debug/res/xml-v25/debug_shortcuts.xml
deleted file mode 100644
index 035328ba..00000000
--- a/ui/src/debug/res/xml-v25/debug_shortcuts.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-    <shortcut
-        android:shortcutId="composeactivity"
-        android:enabled="true"
-        android:icon="@drawable/ic_experimental_feature"
-        android:shortcutShortLabel="@string/shortcut_compose_activity"
-        android:shortcutLongLabel="@string/shortcut_compose_activity">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="de.mm20.launcher2.debug"
-            android:targetClass="de.mm20.launcher2.ui.activity.ComposeActivity" />
-    </shortcut>
-</shortcuts>
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 476c2a61..f9fbb15e 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -24,6 +24,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/debug_shortcuts" />
+
         </activity>
         <activity
             android:name=".activity.ComposeActivity"
diff --git a/ui/src/main/res/xml-v25/debug_shortcuts.xml b/ui/src/main/res/xml-v25/debug_shortcuts.xml
new file mode 100644
index 00000000..b9822dd8
--- /dev/null
+++ b/ui/src/main/res/xml-v25/debug_shortcuts.xml
@@ -0,0 +1,2 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+</shortcuts>