Revert "Make icon show in launcher in first install"

This reverts commit 9ddf3c2.
WSTxda · Jan 15, 2024 · e75e340 · e75e340
1 parent 6abba3c
commit e75e340
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
@@ -366,19 +366,19 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <!-- microG Settings hide in Launcher -->
+        <!-- microG Settings shown in Launcher -->
         <activity-alias
             android:name="org.microg.gms.ui.SettingsActivityLauncher"
             android:enabled="false"
             android:exported="true"
             android:targetActivity="org.microg.gms.ui.MainSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
 

diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt
@@ -49,7 +49,7 @@ class SettingsFragment : ResourceSettingsFragment() {
         findPreference<SwitchPreference>(PREF_CAST_HIDE_LAUNCHER_ICON)?.apply {
             setOnPreferenceChangeListener { _, newValue ->
                 pm.setComponentEnabledSetting(
-                    ComponentName.createRelative(requireActivity(), "org.microg.gms.ui.MainSettingsActivity"),
+                    ComponentName.createRelative(requireActivity(), "org.microg.gms.ui.SettingsActivityLauncher"),
                     when (newValue) {
                         true -> PackageManager.COMPONENT_ENABLED_STATE_DISABLED
                         else -> PackageManager.COMPONENT_ENABLED_STATE_ENABLED

diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml
@@ -25,8 +25,7 @@
                 android:targetClass="org.microg.gms.ui.SelfCheckFragment$AsActivity"
                 android:targetPackage="@string/var_pref_start_gms_package" />
         </Preference>
-    <PreferenceCategory android:layout="@layout/preference_category_no_label"
-        android:key="prefcat_google_services">
+    <PreferenceCategory android:layout="@layout/preference_category_no_label" android:key="prefcat_google_services">
         <Preference
             android:icon="@drawable/ic_add_account"
             android:key="pref_accounts"
@@ -44,10 +43,9 @@
             android:key="pref_hide_launcher_icon"
             android:icon="@drawable/ic_hide_launcher_icon"
             android:title="@string/pref_hide_launcher_icon"
-            android:defaultValue="false"/>
+            android:defaultValue="true"/>
     </PreferenceCategory>
-    <PreferenceCategory android:layout="@layout/preference_category_no_label"
-        android:key="prefcat_footer">
+    <PreferenceCategory android:layout="@layout/preference_category_no_label" android:key="prefcat_footer">
         <Preference
             android:icon="@drawable/ic_developer"
             android:summary="@string/developer"