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

Commit f6b13cba authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'clean-settings-pie' into 'v1-pie' 

microG: move it under System/Advanced

See merge request !50
parents 7b4d7c05 710e5e4e

AndroidManifest.xml

+0 −16
Original line number Diff line number Diff line
@@ -3409,22 +3409,6 @@ 
                 android:permission="android.permission.BIND_JOB_SERVICE" />



	<!-- /e/ specific changes -->

        <activity android:name="Settings$MicroGActivity"

            android:label="@string/micro_g"

            android:icon="@drawable/ic_homepage_microg">

            <intent-filter android:priority="1">

                <action android:name="android.settings.MICROG_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="-1">

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

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.MicroGSettings" />

        </activity>



        <activity android:name="Settings$OpenKeychainActivity"

            android:label="@string/open_keychain"

            android:icon="@drawable/ic_homepage_openkeychain">

res/xml/system_dashboard_fragment.xml

+12 −0
Original line number Diff line number Diff line
@@ -22,6 +22,18 @@ 
    android:title="@string/header_category_system"

    settings:initialExpandedChildrenCount="4">



    <Preference

        android:key="microg_settings"

        android:title="@string/micro_g"

        android:icon="@drawable/ic_microg_settings"

        android:order="-252"

        android:fragment="com.android.settings.MicroGSettings">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.google.android.gms"

            android:targetClass="org.microg.gms.ui.SettingsActivity" />

    </Preference>





    <Preference

        android:key="gesture_settings"

        android:title="@string/gesture_preference_title"

src/com/android/settings/core/gateway/SettingsGateway.java

+0 −2
Original line number Diff line number Diff line
@@ -266,7 +266,6 @@ public class SettingsGateway { 
            DirectoryAccessDetails.class.getName(),

            ToggleBackupSettingFragment.class.getName(),

            PreviouslyConnectedDeviceDashboardFragment.class.getName(),

            MicroGSettings.class.getName(),

            OpenKeychainSettings.class.getName(),

            SystemUpdaterSettings.class.getName(),

    };
@@ -284,7 +283,6 @@ public class SettingsGateway { 
            Settings.SecurityDashboardActivity.class.getName(),

            Settings.AccessibilitySettingsActivity.class.getName(),

            Settings.SystemDashboardActivity.class.getName(),

	    // Settings.MicroGActivity.class.getName(),

            SupportDashboardActivity.class.getName(),

            // Home page > Network & Internet

            Settings.WifiSettingsActivity.class.getName(),