diff options
author | Lifu Tang <lifu@google.com> | 2015-03-26 17:56:52 -0700 |
---|---|---|
committer | Lifu Tang <lifu@google.com> | 2015-03-27 12:39:40 -0700 |
commit | ff6d4894e8f5aa359a621c52864f77f66909481a (patch) | |
tree | f1fb6e2b9492b793f668c186252fe15a9e1d2589 /src/com/android/settings | |
parent | 390910b333c9badbfc0dab5b851853ef82e95502 (diff) | |
download | packages_apps_Settings-ff6d4894e8f5aa359a621c52864f77f66909481a.zip packages_apps_Settings-ff6d4894e8f5aa359a621c52864f77f66909481a.tar.gz packages_apps_Settings-ff6d4894e8f5aa359a621c52864f77f66909481a.tar.bz2 |
Made scanning settings searchable
Bug: 19965598
Change-Id: I2868bc2185d56861f5a0927bb8d49d978e99f33b
Diffstat (limited to 'src/com/android/settings')
-rw-r--r-- | src/com/android/settings/search/Ranking.java | 6 | ||||
-rw-r--r-- | src/com/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 e418e9b..c96ce09 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 d5aa4b7..102e0bf 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()), |