Merge "Support full field search for contacts" into ui_dev_2.0

1 files changed, 18 insertions, 0 deletions

diff --git a/src/com/android/providers/contacts/DataRowHandlerForCustomMimetype.java b/src/com/android/providers/contacts/DataRowHandlerForCustomMimetype.java
index 1de0823..42b4884 100644
--- a/src/com/android/providers/contacts/DataRowHandlerForCustomMimetype.java
+++ b/src/com/android/providers/contacts/DataRowHandlerForCustomMimetype.java
@@ -17,6 +17,11 @@ package com.android.providers.contacts;
 
 import android.content.Context;
 import com.android.providers.contacts.aggregation.AbstractContactAggregator;
+import android.content.ContentValues;
+import android.provider.ContactsContract.Data;
+
+import com.android.providers.contacts.aggregation.ContactAggregator;
+import com.android.providers.contacts.SearchIndexManager.IndexBuilder;
 
 public class DataRowHandlerForCustomMimetype extends DataRowHandler {
 
@@ -24,4 +29,17 @@ public class DataRowHandlerForCustomMimetype extends DataRowHandler {
             AbstractContactAggregator aggregator, String mimetype) {
         super(context, dbHelper, aggregator, mimetype);
     }
+    @Override
+    public boolean hasSearchableData() {
+        return true;
+    }
+    @Override
+    public boolean containsSearchableColumns(ContentValues values) {
+        return values.containsKey(Data.DATA1);
+    }
+
+    @Override
+    public void appendSearchableData(IndexBuilder builder) {
+        builder.appendContentFromColumn(Data.DATA1);
+    }
 }