Full text search: switching to the new API.
This is half-done for now. The snippets will
need to be post-processed.
Bug: 2078420
Change-Id: I20d84835b6eff8553007f67f7c0fbb25a8de4fbe
diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index a6db641..cfacc85 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -79,9 +79,7 @@
Contacts.LOOKUP_KEY, // 9
Contacts.PHONETIC_NAME, // 10
Contacts.HAS_PHONE_NUMBER, // 11
- SearchSnippetColumns.SNIPPET_MIMETYPE, // 12
- SearchSnippetColumns.SNIPPET_DATA1, // 13
- SearchSnippetColumns.SNIPPET_DATA4, // 14
+ SearchSnippetColumns.SNIPPET, // 12
};
protected static final int CONTACT_ID_COLUMN_INDEX = 0;
@@ -96,9 +94,7 @@
protected static final int CONTACT_LOOKUP_KEY_COLUMN_INDEX = 9;
protected static final int CONTACT_PHONETIC_NAME_COLUMN_INDEX = 10;
protected static final int CONTACT_HAS_PHONE_COLUMN_INDEX = 11;
- protected static final int CONTACT_SNIPPET_MIMETYPE_COLUMN_INDEX = 12;
- protected static final int CONTACT_SNIPPET_DATA1_COLUMN_INDEX = 13;
- protected static final int CONTACT_SNIPPET_DATA4_COLUMN_INDEX = 14;
+ protected static final int CONTACT_SNIPPET_COLUMN_INDEX = 12;
private CharSequence mUnknownNameText;
private int mDisplayNameColumnIndex;
@@ -289,8 +285,7 @@
}
protected void bindSearchSnippet(final ContactListItemView view, Cursor cursor) {
- view.showSnippet(cursor, CONTACT_SNIPPET_MIMETYPE_COLUMN_INDEX,
- CONTACT_SNIPPET_DATA1_COLUMN_INDEX, CONTACT_SNIPPET_DATA4_COLUMN_INDEX);
+ view.showSnippet(cursor, CONTACT_SNIPPET_COLUMN_INDEX);
}
public int getSelectedContactPosition() {
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index c943534..7fdedcf 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -30,10 +30,6 @@
import android.graphics.Rect;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
-import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.provider.ContactsContract.CommonDataKinds.Nickname;
-import android.provider.ContactsContract.CommonDataKinds.Organization;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.Contacts;
import android.text.SpannableString;
import android.text.TextUtils;
@@ -863,36 +859,14 @@
/**
* Shows search snippet.
*/
- public void showSnippet(Cursor cursor, int summarySnippetMimetypeColumnIndex,
- int summarySnippetData1ColumnIndex, int summarySnippetData4ColumnIndex) {
- if (cursor.getColumnCount() <= summarySnippetMimetypeColumnIndex) {
+ public void showSnippet(Cursor cursor, int summarySnippetColumnIndex) {
+ if (cursor.getColumnCount() <= summarySnippetColumnIndex) {
setSnippet(null);
return;
}
- String snippet = null;
- String snippetMimeType = cursor.getString(summarySnippetMimetypeColumnIndex);
- if (Email.CONTENT_ITEM_TYPE.equals(snippetMimeType)
- || Nickname.CONTENT_ITEM_TYPE.equals(snippetMimeType)
- || Phone.CONTENT_ITEM_TYPE.equals(snippetMimeType)) {
- String value = cursor.getString(summarySnippetData1ColumnIndex);
- if (!TextUtils.isEmpty(value)) {
- snippet = value;
- }
- } else if (Organization.CONTENT_ITEM_TYPE.equals(snippetMimeType)) {
- String company = cursor.getString(summarySnippetData1ColumnIndex);
- String title = cursor.getString(summarySnippetData4ColumnIndex);
- if (!TextUtils.isEmpty(company)) {
- if (!TextUtils.isEmpty(title)) {
- snippet = company + " / " + title;
- } else {
- snippet = company;
- }
- } else if (!TextUtils.isEmpty(title)) {
- snippet = title;
- }
- }
-
+ String snippet = cursor.getString(summarySnippetColumnIndex);
+ // TODO postprocess snippet
setSnippet(snippet);
}