Add Gestures settings to search index.

Add GestureSettings class to the resource map of
SearchIndeSearchIndexableResources so that the preferences in the
gestures settings will be indexed and showed up as search result.

Bug: 30169776
Change-Id: I51be9e82dc8bce93e2abd13b48ceb3cd051cbcf4

diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
index 2c065ac..f0480e3 100644 (file)
--- a/src/com/android/settings/gestures/GestureSettings.java
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@ -230,6 +230,9 @@ public class GestureSettings extends SettingsPreferenceFragment implements
                 if (!isSystemUINavigationAvailable(context)) {
                     result.add(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
                 }
+                if (!isDoubleTwistAvailable(context)) {
+                    result.add(PREF_KEY_DOUBLE_TWIST);
+                }
                 return result;
             }
         };

diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 80eb6d4..2137bd5 100644 (file)
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -38,6 +38,7 @@ import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.display.ScreenZoomSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.gestures.GestureSettings;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.location.LocationSettings;
 import com.android.settings.location.ScanningSettings;
@@ -85,6 +86,7 @@ public final class Ranking {
     public static final int RANK_PRINTING = 21;
     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_UNDEFINED = -1;
     public static final int RANK_OTHERS = 1024;
@@ -146,6 +148,9 @@ public final class Ranking {
         // Users
         sRankMap.put(UserSettings.class.getName(), RANK_USERS);
 
+        // Gestures
+        sRankMap.put(GestureSettings.class.getName(), RANK_GESTURE);
+
         // Location
         sRankMap.put(LocationSettings.class.getName(), RANK_LOCATION);
         sRankMap.put(ScanningSettings.class.getName(), RANK_LOCATION);

diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index ff633e0..5332d99 100644 (file)
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -39,6 +39,7 @@ import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.display.ScreenZoomSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.gestures.GestureSettings;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.location.LocationSettings;
 import com.android.settings.location.ScanningSettings;
@@ -220,6 +221,13 @@ public final class SearchIndexableResources {
                         UserSettings.class.getName(),
                         R.drawable.ic_settings_multiuser));
 
+        sResMap.put(GestureSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(GestureSettings.class.getName()),
+                        NO_DATA_RES_ID,
+                        GestureSettings.class.getName(),
+                        R.drawable.ic_settings_gestures));
+
         sResMap.put(LocationSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(LocationSettings.class.getName()),