From c4d2b6623081926f7ef7a26a40e2eff67279ba62 Mon Sep 17 00:00:00 2001
From: Sumit Pundir <pundirsumit11@gmail.com>
Date: Mon, 31 Aug 2020 22:38:06 +0530
Subject: [PATCH 1/3] microG: move it under System/Advanced

Fixes https://gitlab.e.foundation/e/backlog/-/issues/484
Moved it to top of the advanced list options under System.

Signed-off-by: Sumit Pundir <pundirsumit11@gmail.com>
Change-Id: Ie58347818d2f14a41c46d3dcf84f16ec1e8dea34
---
 AndroidManifest.xml                                 |  4 ++--
 res/xml/system_dashboard_fragment.xml               | 13 ++++++++++++-
 .../settings/core/gateway/SettingsGateway.java      |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d802fcb7460..09c2e97dd65 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3291,7 +3291,7 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />
 	</activity>
-	<!-- /e/ specific changes -->
+	<!-- /e/ specific changes >
         <activity android:name="Settings$MicroGActivity"
             android:label="@string/micro_g"
             android:icon="@drawable/ic_homepage_microg">
@@ -3306,7 +3306,7 @@
                 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 -->
 
         <activity android:name="Settings$OpenKeychainActivity"
             android:label="@string/open_keychain"
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 6a753f2a009..aa9fec6d399 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -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"
@@ -60,4 +71,4 @@
                 android:targetClass="@string/additional_system_update_menu" />
     </Preference>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index e76e15f3dbd..8e075669c7e 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -286,7 +286,7 @@ public class SettingsGateway {
             MobileNetworkListFragment.class.getName(),
             GlobalActionsPanelSettings.class.getName(),
             DarkModeSettingsFragment.class.getName(),
-            MicroGSettings.class.getName(),
+            //MicroGSettings.class.getName(),
             OpenKeychainSettings.class.getName(),
     };
 
@@ -304,7 +304,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(),
@@ -321,6 +320,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(),
-- 
GitLab


From 2b3edaa5e256c0ea86803b3f7888c846fe1e7a06 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Tue, 27 Oct 2020 17:43:24 +0100
Subject: [PATCH 2/3] Clean

---
 AndroidManifest.xml                            | 18 +-----------------
 .../settings/core/gateway/SettingsGateway.java |  1 -
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 09c2e97dd65..fb9e8e00f28 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3291,23 +3291,7 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 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 -->
-
+	<!-- /e/ specific changes >-->
         <activity android:name="Settings$OpenKeychainActivity"
             android:label="@string/open_keychain"
             android:icon="@drawable/ic_homepage_openkeychain">
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 8e075669c7e..244ddc00fb8 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -286,7 +286,6 @@ public class SettingsGateway {
             MobileNetworkListFragment.class.getName(),
             GlobalActionsPanelSettings.class.getName(),
             DarkModeSettingsFragment.class.getName(),
-            //MicroGSettings.class.getName(),
             OpenKeychainSettings.class.getName(),
     };
 
-- 
GitLab


From ca0078ab9c077514d521326cd272e6e15358a915 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Tue, 27 Oct 2020 17:43:59 +0100
Subject: [PATCH 3/3] clean 2

---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fb9e8e00f28..ee8484e2905 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3291,7 +3291,7 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />
 	</activity>
-	<!-- /e/ specific changes >-->
+	<!-- /e/ specific changes -->
         <activity android:name="Settings$OpenKeychainActivity"
             android:label="@string/open_keychain"
             android:icon="@drawable/ic_homepage_openkeychain">
-- 
GitLab