From 1231a9454ba268162783a11185da0ab180138dc8 Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Wed, 30 Sep 2020 13:51:07 +0530
Subject: [PATCH 1/3] microG: move it under System/Advanced

---
 AndroidManifest.xml                                  |  4 ++--
 res/xml/system_dashboard_fragment.xml                | 12 ++++++++++++
 .../settings/core/gateway/SettingsGateway.java       |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad38a9899ef..142050dd8e2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3409,7 +3409,7 @@
                  android:permission="android.permission.BIND_JOB_SERVICE" />
 
 	<!-- /e/ specific changes -->
-        <activity android:name="Settings$MicroGActivity"
+      <!--  <activity android:name="Settings$MicroGActivity"
             android:label="@string/micro_g"
             android:icon="@drawable/ic_homepage_microg">
             <intent-filter android:priority="1">
@@ -3424,7 +3424,7 @@
             <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">
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 969335cf60d..3c66cddd3fb 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -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"
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index b5bbec37fb3..79a051a3dc7 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -266,7 +266,7 @@ public class SettingsGateway {
             DirectoryAccessDetails.class.getName(),
             ToggleBackupSettingFragment.class.getName(),
             PreviouslyConnectedDeviceDashboardFragment.class.getName(),
-            MicroGSettings.class.getName(),
+//            MicroGSettings.class.getName(),
             OpenKeychainSettings.class.getName(),
             SystemUpdaterSettings.class.getName(),
     };
-- 
GitLab


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

---
 AndroidManifest.xml                              | 16 ----------------
 .../settings/core/gateway/SettingsGateway.java   |  1 -
 2 files changed, 17 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 142050dd8e2..bc2db4efad5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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">
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 79a051a3dc7..4bf90137b23 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -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(),
     };
-- 
GitLab


From 79643a6446905ec4ea9bd2589a13ed4120238d13 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Tue, 27 Oct 2020 17:45:33 +0100
Subject: [PATCH 3/3] clean2

---
 src/com/android/settings/core/gateway/SettingsGateway.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 4bf90137b23..de787ac655f 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -283,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(),
-- 
GitLab