PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Made scanning settings searchable"

Browse Source
This commit is contained in:
Lifu Tang
2015-03-27 19:51:46 +00:00
committed by Android (Google) Code Review
parent 8a963babe2 ff6d4894e8
commit a369820002
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/search/Ranking.java
View File

@@ -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);

8
src/com/android/settings/search/SearchIndexableResources.java
View File

@@ -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()),