Separates launcher icon from main settings activity (so it can be dis…

…abled without making microG settings inaccessible since there are launchers that doesn't allow to hide Apps on their own)
microg · Sep 19, 2023 · ce9220e · ce9220e
1 parent 1f855bc
commit ce9220e
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
@@ -493,9 +493,9 @@
             android:authorities="com.google.android.gms.fonts"
             android:exported="true" />
 
-        <!-- microG Settings shown in Launcher -->
+        <!-- microG Settings activity -->
         <activity
-            android:name="org.microg.gms.ui.SettingsActivity"
+            android:name="org.microg.gms.ui.MainSettingsActivity"
             android:icon="@mipmap/ic_app_settings"
             android:label="@string/gms_settings_name"
             android:process=":ui"
@@ -511,7 +511,6 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
@@ -522,6 +521,22 @@
             </intent-filter>
         </activity>
 
+        <!-- microG Settings activity-alias shown in Launcher -->
+        <activity-alias
+            android:name="org.microg.gms.ui.SettingsActivity"
+            android:icon="@mipmap/ic_app_settings"
+            android:label="@string/gms_settings_name"
+            android:roundIcon="@mipmap/ic_app_settings"
+            android:process=":ui"
+            android:targetActivity="org.microg.gms.ui.SettingsActivity"
+            android:taskAffinity="org.microg.gms.settings">
+            <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.SettingsDashboardActivity"
             android:icon="@mipmap/ic_app_settings"