Separate launcher icon from main activity

play-services-core/src/main/AndroidManifest.xml

@@ -424,15 +424,8 @@
         <!-- microG Settings shown in Launcher -->
         <activity
             android:name="org.microg.gms.ui.SettingsActivity"
-            android:icon="@mipmap/ic_microg_settings"
-            android:roundIcon="@mipmap/ic_microg_settings"
-            android:label="@string/gms_settings_name"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Settings.Dashboard">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -441,6 +434,7 @@
 
         <!-- microG Settings embedded in System Settings on SDK 23 and newer -->
         <activity-alias
+            android:enabled="true"
             android:name="org.microg.gms.ui.SettingsActivityLink"
             android:targetActivity="org.microg.gms.ui.SettingsActivity"
             android:icon="@drawable/microg_light_color_24"
@@ -455,6 +449,21 @@
             <meta-data android:name="com.android.settings.summary" android:resource="@string/gms_settings_summary"/>
         </activity-alias>
 
+        <!-- Separate launcher icon from main activity so it can be disabled manualy -->
+        <activity-alias
+            android:enabled="true"
+            android:name="org.microg.gms.ui.SettingsActivityLauncher"
+            android:targetActivity="org.microg.gms.ui.SettingsActivity"
+            android:icon="@mipmap/ic_microg_settings"
+            android:roundIcon="@mipmap/ic_microg_settings"
+            android:label="@string/gms_settings_name"
+            android:theme="@style/Theme.AppCompat.Settings.Dashboard">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity-alias>
+
         <activity
             android:name="org.microg.gms.ui.AskPushPermission"
             android:excludeFromRecents="true"