From 37eb6f459da90cabad636d7904eb212ee3e1af45 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Tue, 18 Dec 2018 17:44:36 +0100
Subject: [PATCH] Index MicroG for search feature

---
 res/values-fr/strings.xml                     |  1 -
 res/values/strings.xml                        |  1 -
 res/xml/micro_g_prefs.xml                     | 28 +++++++++++++++++++
 src/com/android/settings/MicroGSettings.java  | 23 +++++++++++++++
 src/com/android/settings/search/Ranking.java  |  5 ++++
 .../search/SearchIndexableResources.java      |  8 ++++++
 6 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 res/xml/micro_g_prefs.xml

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8f9674136d..684fb28754 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3260,5 +3260,4 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informations de gestion des comptes opérateur"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher la gestion des comptes opérateur"</string>
     <string name="micro_g">"MicroG"</string>
-    <string name="micro_g_title">"Accéder aux paramètres microG"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0bba23098f..b125edb5f9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7961,7 +7961,6 @@
     <string name="touchscreen_gesture_settings_summary">Perform various touchscreen gestures for quick actions</string>
 
     <string name="micro_g">MicroG</string>
-    <string name="micro_g_title">Access to MicroG settings</string>
 
     <string name="e_contributors_title">/e/ contributors</string>
     <string name="lineageos_contributors_title">LineageOS contributors</string>
diff --git a/res/xml/micro_g_prefs.xml b/res/xml/micro_g_prefs.xml
new file mode 100644
index 0000000000..56725e2257
--- /dev/null
+++ b/res/xml/micro_g_prefs.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:key="microg_settings"
+        android:title="@string/micro_g">
+
+    <Preference>
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.google.android.gms"
+            android:targetClass="org.microg.gms.ui.SettingsActivity" />
+    </Preference>
+
+</PreferenceScreen>
diff --git a/src/com/android/settings/MicroGSettings.java b/src/com/android/settings/MicroGSettings.java
index 486da1a1e2..10a04d04c3 100644
--- a/src/com/android/settings/MicroGSettings.java
+++ b/src/com/android/settings/MicroGSettings.java
@@ -22,6 +22,15 @@ import android.content.ComponentName;
 import android.app.Fragment;
 import android.app.Activity;
 
+import android.app.Activity;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import java.util.ArrayList;
+import java.util.List;
+
 public class MicroGSettings extends Fragment {
 
     @Override
@@ -38,4 +47,18 @@ public class MicroGSettings extends Fragment {
           activity.finish();
         }
     }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+    new BaseSearchIndexProvider() {
+        @Override
+        public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                boolean enabled) {
+            final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+            final SearchIndexableResource sir = new SearchIndexableResource(context);
+            sir.xmlResId = R.xml.micro_g_prefs;
+            result.add(sir);
+            return result;
+        }
+    };
 }
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 2137bd545a..245f33ae0a 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -55,6 +55,7 @@ import com.android.settings.users.UserSettings;
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
+import com.android.settings.MicroGSettings;
 
 import java.util.HashMap;
 
@@ -87,6 +88,7 @@ public final class Ranking {
     public static final int RANK_DEVELOPEMENT = 22;
     public static final int RANK_DEVICE_INFO = 23;
     public static final int RANK_GESTURE = 24;
+    public static final int RANK_MICROG = 25;
 
     public static final int RANK_UNDEFINED = -1;
     public static final int RANK_OTHERS = 1024;
@@ -185,6 +187,9 @@ public final class Ranking {
         sRankMap.put(DeviceInfoSettings.class.getName(), RANK_DEVICE_INFO);
         sRankMap.put(LegalSettings.class.getName(), RANK_DEVICE_INFO);
 
+        // MicroG
+        sRankMap.put(MicroGSettings.class.getName(), RANK_MICROG);
+
         sBaseRankMap.put("com.android.settings", 0);
     }
 
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 1b8a34754b..378048e4ae 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -55,6 +55,7 @@ import com.android.settings.users.UserSettings;
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
+import com.android.settings.MicroGSettings;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -326,6 +327,13 @@ public final class SearchIndexableResources {
                         R.xml.zen_mode_visual_interruptions_settings,
                         ZenModeVisualInterruptionSettings.class.getName(),
                         R.drawable.ic_settings_notifications));
+
+        sResMap.put(MicroGSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(MicroGSettings.class.getName()),
+                        R.xml.micro_g_prefs,
+                        MicroGSettings.class.getName(),
+                        R.drawable.ic_microg_settings));
     }
 
     private SearchIndexableResources() {
-- 
2.26.2