Full text search: email suggestions

Also, removing a bunch of dead code

Bug: 2078420
Change-Id: I2c0a9ddd8e60624049b39ac018f87bfabc6574c2

1 files changed, 19 insertions, 5 deletions

diff --git a/src/com/android/providers/contacts/SearchIndexManager.java b/src/com/android/providers/contacts/SearchIndexManager.java
index 7555c99..d198337 100644
--- a/src/com/android/providers/contacts/SearchIndexManager.java
+++ b/src/com/android/providers/contacts/SearchIndexManager.java
@@ -66,6 +66,7 @@ public class SearchIndexManager {
         public static final int SEPARATOR_COMMA = 3;
 
         private StringBuilder mSbContent = new StringBuilder();
+        private StringBuilder mSbName = new StringBuilder();
         private StringBuilder mSbTokens = new StringBuilder();
         private StringBuilder mSbElementContent = new StringBuilder();
         private HashSet<String> mUniqueElements = new HashSet<String>();
@@ -78,6 +79,7 @@ public class SearchIndexManager {
         void reset() {
             mSbContent.setLength(0);
             mSbTokens.setLength(0);
+            mSbName.setLength(0);
             mSbElementContent.setLength(0);
             mUniqueElements.clear();
         }
@@ -86,6 +88,10 @@ public class SearchIndexManager {
             return mSbContent.length() == 0 ? null : mSbContent.toString();
         }
 
+        public String getName() {
+            return mSbName.length() == 0 ? null : mSbName.toString();
+        }
+
         public String getTokens() {
             return mSbTokens.length() == 0 ? null : mSbTokens.toString();
         }
@@ -100,7 +106,7 @@ public class SearchIndexManager {
 
         @Override
         public String toString() {
-            return "Content: " + mSbContent + "\n Tokens: " + mSbTokens;
+            return "Content: " + mSbContent + "\n Name: " + mSbTokens + "\n Tokens: " + mSbTokens;
         }
 
         public void commit() {
@@ -162,10 +168,6 @@ public class SearchIndexManager {
             }
         }
 
-        public void appendTokenFromColumn(String columnName) {
-            appendToken(getString(columnName));
-        }
-
         public void appendToken(String token) {
             if (TextUtils.isEmpty(token)) {
                 return;
@@ -176,6 +178,17 @@ public class SearchIndexManager {
             }
             mSbTokens.append(token);
         }
+
+        public void appendName(String name) {
+            if (TextUtils.isEmpty(name)) {
+                return;
+            }
+
+            if (mSbName.length() != 0) {
+                mSbName.append(' ');
+            }
+            mSbName.append(name);
+        }
     }
 
     private final ContactsProvider2 mContactsProvider;
@@ -309,6 +322,7 @@ public class SearchIndexManager {
             SQLiteDatabase db, long contactId, IndexBuilder builder, boolean replace) {
         mValues.clear();
         mValues.put(SearchIndexColumns.CONTENT, builder.getContent());
+        mValues.put(SearchIndexColumns.NAME, builder.getName());
         mValues.put(SearchIndexColumns.TOKENS, builder.getTokens());
         if (replace) {
             mSelectionArgs1[0] = String.valueOf(contactId);