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

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

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

microG: move it under System/Advanced

Closes e/backlog#484

See merge request !40
parents f8193b5c aeb4b9e1

AndroidManifest.xml

+0 −16
Original line number Diff line number Diff line
@@ -3307,22 +3307,6 @@ 
                android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />

	</activity>

	<!-- /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="6">

                <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

+11 −0
Original line number Diff line number Diff line
@@ -21,6 +21,17 @@ 
    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

+1 −2
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ public class SettingsGateway { 
            MobileNetworkListFragment.class.getName(),

            GlobalActionsPanelSettings.class.getName(),

            DarkModeSettingsFragment.class.getName(),

            MicroGSettings.class.getName(),

            OpenKeychainSettings.class.getName(),

            SystemUpdaterSettings.class.getName(),

    };
@@ -306,7 +305,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(),
@@ -323,6 +321,7 @@ public class SettingsGateway { 
            // Home page > Security & screen lock

            Settings.LocationSettingsActivity.class.getName(),

            // Home page > System

	    Settings.MicroGActivity.class.getName(),

            Settings.LanguageAndInputSettingsActivity.class.getName(),

            Settings.DateTimeSettingsActivity.class.getName(),

            Settings.EnterprisePrivacySettingsActivity.class.getName(),