From c94382e84e4b899873b1005cb21f1370f8f13319 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Thu, 16 Oct 2014 14:42:10 -0700
Subject: [PATCH] Fix bug #18017952 It does not search all possible "USB"
 results that can be found in the settings

- add indexing for UsbSettings
- change constant name from RANK_MEMORY to RANK_STORAGE
- fix old issue with the PreferenceScreen title (as Location instead of USB computer connection)

Change-Id: I1395ec3d6a795edf73a8703545540456a477cc21
---
 res/xml/usb_settings.xml                                  | 2 +-
 src/com/android/settings/search/Ranking.java              | 8 +++++---
 .../android/settings/search/SearchIndexableResources.java | 8 ++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/res/xml/usb_settings.xml b/res/xml/usb_settings.xml
index 4d6ccc92ea4..4b0268be7ba 100644
--- a/res/xml/usb_settings.xml
+++ b/res/xml/usb_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/location_settings_title">
+        android:title="@string/storage_title_usb">
 
     <PreferenceCategory
             android:title="@string/usb_connection_category" />
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 2c7600297d9..6abbc3d4590 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -31,6 +31,7 @@ import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
@@ -63,7 +64,7 @@ public final class Ranking {
     public static final int RANK_DISPLAY = 7;
     public static final int RANK_WALLPAPER = 8;
     public static final int RANK_NOTIFICATIONS = 9;
-    public static final int RANK_MEMORY = 10;
+    public static final int RANK_STORAGE = 10;
     public static final int RANK_POWER_USAGE = 11;
     public static final int RANK_USERS = 12;
     public static final int RANK_LOCATION = 13;
@@ -118,8 +119,9 @@ public final class Ranking {
         sRankMap.put(OtherSoundSettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(ZenModeSettings.class.getName(), RANK_NOTIFICATIONS);
 
-        // Memory
-        sRankMap.put(Memory.class.getName(), RANK_MEMORY);
+        // Storage
+        sRankMap.put(Memory.class.getName(), RANK_STORAGE);
+        sRankMap.put(UsbSettings.class.getName(), RANK_STORAGE);
 
         // Battery
         sRankMap.put(PowerUsageSummary.class.getName(), RANK_POWER_USAGE);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 105ce7ef180..3051fd206d9 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -33,6 +33,7 @@ import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.UsbSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
@@ -165,6 +166,13 @@ public final class SearchIndexableResources {
                         Memory.class.getName(),
                         R.drawable.ic_settings_storage));
 
+        sResMap.put(UsbSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(UsbSettings.class.getName()),
+                        R.xml.usb_settings,
+                        UsbSettings.class.getName(),
+                        R.drawable.ic_settings_storage));
+
         sResMap.put(PowerUsageSummary.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(PowerUsageSummary.class.getName()),