From fccae7a784883596803af548fffd42a9f1cc460f Mon Sep 17 00:00:00 2001
From: winting0704 <winting0704@gmail.com>
Date: Sat, 22 Feb 2025 13:41:48 +0800
Subject: [PATCH 1/2] Remove duplicate LAUNCHER declaration

There's no need to declare in samples' manifest.
Otherwise, it will create more icons in launcher.
---
 .../callnotification/src/main/AndroidManifest.xml         | 8 +-------
 samples/user-interface/share/src/main/AndroidManifest.xml | 5 -----
 .../windowmanager/src/main/AndroidManifest.xml            | 8 +-------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/samples/connectivity/callnotification/src/main/AndroidManifest.xml b/samples/connectivity/callnotification/src/main/AndroidManifest.xml
index c3792ac0..8e40c518 100644
--- a/samples/connectivity/callnotification/src/main/AndroidManifest.xml
+++ b/samples/connectivity/callnotification/src/main/AndroidManifest.xml
@@ -23,13 +23,7 @@
     <activity
         android:name=".CallNotificationSample"
         android:launchMode="singleTop"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-    </activity>
+        android:exported="true" />
 
     <receiver android:name=".CallNotificationSample$NotificationReceiver"
         android:exported="false"/>
diff --git a/samples/user-interface/share/src/main/AndroidManifest.xml b/samples/user-interface/share/src/main/AndroidManifest.xml
index de107e14..333b1760 100644
--- a/samples/user-interface/share/src/main/AndroidManifest.xml
+++ b/samples/user-interface/share/src/main/AndroidManifest.xml
@@ -35,11 +35,6 @@
             android:exported="true"
             android:label="@string/receive_share">
 
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
             <!--
                 Handle ACTION_SEND intents to receive data shared by other apps.
             -->
diff --git a/samples/user-interface/windowmanager/src/main/AndroidManifest.xml b/samples/user-interface/windowmanager/src/main/AndroidManifest.xml
index 3fc22dc9..b19cfebf 100644
--- a/samples/user-interface/windowmanager/src/main/AndroidManifest.xml
+++ b/samples/user-interface/windowmanager/src/main/AndroidManifest.xml
@@ -29,13 +29,7 @@
         <activity
             android:name=".demos.WindowDemosActivity"
             android:exported="true"
-            android:label="@string/windowManagerDemos">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:label="@string/windowManagerDemos" />
         <activity
             android:name=".DualScreenActivity"
             android:exported="false"

From ac090f82df3cfa3f376a0eac2c17d48c2862e95a Mon Sep 17 00:00:00 2001
From: winting0704 <winting0704@gmail.com>
Date: Sat, 8 Mar 2025 20:07:18 +0800
Subject: [PATCH 2/2] Revert "Remove duplicate LAUNCHER declaration"

This reverts commit fccae7a784883596803af548fffd42a9f1cc460f.
---
 .../callnotification/src/main/AndroidManifest.xml         | 8 +++++++-
 samples/user-interface/share/src/main/AndroidManifest.xml | 5 +++++
 .../windowmanager/src/main/AndroidManifest.xml            | 8 +++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/samples/connectivity/callnotification/src/main/AndroidManifest.xml b/samples/connectivity/callnotification/src/main/AndroidManifest.xml
index 8e40c518..c3792ac0 100644
--- a/samples/connectivity/callnotification/src/main/AndroidManifest.xml
+++ b/samples/connectivity/callnotification/src/main/AndroidManifest.xml
@@ -23,7 +23,13 @@
     <activity
         android:name=".CallNotificationSample"
         android:launchMode="singleTop"
-        android:exported="true" />
+        android:exported="true">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+    </activity>
 
     <receiver android:name=".CallNotificationSample$NotificationReceiver"
         android:exported="false"/>
diff --git a/samples/user-interface/share/src/main/AndroidManifest.xml b/samples/user-interface/share/src/main/AndroidManifest.xml
index 333b1760..de107e14 100644
--- a/samples/user-interface/share/src/main/AndroidManifest.xml
+++ b/samples/user-interface/share/src/main/AndroidManifest.xml
@@ -35,6 +35,11 @@
             android:exported="true"
             android:label="@string/receive_share">
 
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
             <!--
                 Handle ACTION_SEND intents to receive data shared by other apps.
             -->
diff --git a/samples/user-interface/windowmanager/src/main/AndroidManifest.xml b/samples/user-interface/windowmanager/src/main/AndroidManifest.xml
index b19cfebf..3fc22dc9 100644
--- a/samples/user-interface/windowmanager/src/main/AndroidManifest.xml
+++ b/samples/user-interface/windowmanager/src/main/AndroidManifest.xml
@@ -29,7 +29,13 @@
         <activity
             android:name=".demos.WindowDemosActivity"
             android:exported="true"
-            android:label="@string/windowManagerDemos" />
+            android:label="@string/windowManagerDemos">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".DualScreenActivity"
             android:exported="false"