Search results - just show the first item of ListPreference entries

- need to increment the database model version to force re-indexing
- change entries separator from SPACE to PIPE
- just show the first entries value in the Search results

Change-Id: I747218ff3528c3231c0209f8870c12f65e036070

3 files changed, 14 insertions, 6 deletions

diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index e78c7a0a6..94f377858 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -342,12 +342,18 @@ public class SearchResultsSummary extends Fragment {
                     !summaryOn.contains(PERCENT_RECLACE) && !summaryOn.contains(DOLLAR_REPLACE)) {
                 sb.append(summaryOn);
                 sb.append(ELLIPSIS);
-            }
-            if (!TextUtils.isEmpty(entries)) {
-                sb.append(" \n ");
-                sb.append(entries);
+            } else if (!TextUtils.isEmpty(entries)) {
+                final int index  = entries.indexOf(Index.ENTRIES_SEPARATOR);
+                if (index > 0) {
+                    final String firstEntriesValue = entries.substring(0, index);
+                    sb.append(firstEntriesValue);
+                } else {
+                    sb.append(entries);
+                }
+                sb.append(ELLIPSIS);
             }
             textSummary.setText(sb.toString());
+
             if (result.iconResId != R.drawable.empty_icon) {
                 final Context packageContext = result.context;
                 final Drawable drawable;
diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index d5d97f5b0..6f9198107 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -100,6 +100,8 @@ public class Index {
     public static final int COLUMN_INDEX_ENABLED = 12;
     public static final int COLUMN_INDEX_KEY = 13;
 
+    public static final String ENTRIES_SEPARATOR = "|";
+
     // If you change the order of columns here, you SHOULD change the COLUMN_INDEX_XXX values
     private static final String[] SELECT_COLUMNS = new String[] {
             IndexColumns.DATA_RANK,               // 0
@@ -994,7 +996,7 @@ public class Index {
         final StringBuilder result = new StringBuilder();
         for (int n = 0; n < count; n++) {
             result.append(data[n]);
-            result.append(" ");
+            result.append(ENTRIES_SEPARATOR);
         }
         return result.toString();
     }
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index afcbfa1aa..4e94cb172 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
     private static final String TAG = "IndexDatabaseHelper";
 
     private static final String DATABASE_NAME = "search_index.db";
-    private static final int DATABASE_VERSION = 108;
+    private static final int DATABASE_VERSION = 109;
 
     public interface Tables {
         public static final String TABLE_PREFS_INDEX = "prefs_index";