From ff6d4894e8f5aa359a621c52864f77f66909481a Mon Sep 17 00:00:00 2001
From: Lifu Tang <lifu@google.com>
Date: Thu, 26 Mar 2015 17:56:52 -0700
Subject: [PATCH] Made scanning settings searchable

Bug: 19965598

Change-Id: I2868bc2185d56861f5a0927bb8d49d978e99f33b
---
 src/com/android/settings/search/Ranking.java              | 6 ++++--
 .../android/settings/search/SearchIndexableResources.java | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index e418e9b3c0e..c96ce09fec3 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -23,10 +23,11 @@ import com.android.settings.DevelopmentSettings;
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.HomeSettings;
-import com.android.settings.ScreenPinningSettings;
 import com.android.settings.PrivacySettings;
+import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
 import com.android.settings.WallpaperTypeSettings;
+import com.android.settings.WifiCallingSettings;
 import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.applications.AdvancedAppSettings;
@@ -37,6 +38,7 @@ import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.location.LocationSettings;
+import com.android.settings.location.ScanningSettings;
 import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.notification.NotificationSettings;
 import com.android.settings.notification.OtherSoundSettings;
@@ -48,7 +50,6 @@ import com.android.settings.voice.VoiceInputSettings;
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.WifiCallingSettings;
 
 import java.util.HashMap;
 
@@ -139,6 +140,7 @@ public final class Ranking {
 
         // Location
         sRankMap.put(LocationSettings.class.getName(), RANK_LOCATION);
+        sRankMap.put(ScanningSettings.class.getName(), RANK_LOCATION);
 
         // Security
         sRankMap.put(SecuritySettings.class.getName(), RANK_SECURITY);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index d5aa4b71c43..102e0bf2a69 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -39,6 +39,7 @@ import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.location.LocationSettings;
+import com.android.settings.location.ScanningSettings;
 import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.notification.NotificationSettings;
 import com.android.settings.notification.OtherSoundSettings;
@@ -210,6 +211,13 @@ public final class SearchIndexableResources {
                         LocationSettings.class.getName(),
                         R.drawable.ic_settings_location));
 
+        sResMap.put(ScanningSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(ScanningSettings.class.getName()),
+                        R.xml.location_scanning,
+                        ScanningSettings.class.getName(),
+                        R.drawable.ic_settings_location));
+
         sResMap.put(SecuritySettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(SecuritySettings.class.getName()),