Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7b7ede9c authored by ale5000's avatar ale5000 Committed by Marvin W.
Browse files

Separates launcher icon from main settings activity (so it can be disabled... 

Separates launcher icon from main settings activity (so it can be disabled without making microG settings inaccessible since there are launchers that doesn't allow to hide Apps on their own)
parent 63e61e8c

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

+19 −4
Original line number Diff line number Diff line
@@ -519,9 +519,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"
@@ -537,7 +537,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>
@@ -548,6 +547,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.MainSettingsActivity"

            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"
@@ -562,7 +577,7 @@ 
            android:icon="@drawable/ic_app_settings_foreground_mono"

            android:label="@string/gms_settings_name"

            android:process=":ui"

            android:targetActivity="org.microg.gms.ui.SettingsActivity"

            android:targetActivity="org.microg.gms.ui.MainSettingsActivity"

            android:taskAffinity="org.microg.gms.settings">

            <intent-filter>

                <action android:name="com.android.settings.action.EXTRA_SETTINGS" />

play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java→play-services-core/src/main/java/org/microg/gms/ui/MainSettingsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ import org.microg.gms.ui.settings.SettingsProvider; 


import static org.microg.gms.ui.settings.SettingsProviderKt.getAllSettingsProviders;



public class SettingsActivity extends AppCompatActivity {

public class MainSettingsActivity extends AppCompatActivity {

    private AppBarConfiguration appBarConfiguration;



    private NavController getNavController() {