release-request-a84b3435-75fa-41e8-bd3c-ca0f4cbd5cc5-for-git_oc-m2-release-4352002 snap-temp-L88700000105039240android-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release

Change-Id: I3f752b0c2806808e11f636538eac871e46c5c596

3 files changed, 27 insertions, 22 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 21ac1b59..d432c2f7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -104,7 +104,7 @@
     <string name="pound_letters"> </string>
 
     <string name="search_title">Search contacts</string>
-    <string name="search_hint">Enter the name of a contact</string>
+    <string name="search_hint">Search contacts</string>
     <string name="type_home">Home</string>
     <string name="type_work">Work</string>
     <string name="type_mobile">Mobile</string>
diff --git a/src/com/android/car/dialer/ContactResultsAdapter.java b/src/com/android/car/dialer/ContactResultsAdapter.java
index 02ec4daf..d637f9d9 100644
--- a/src/com/android/car/dialer/ContactResultsAdapter.java
+++ b/src/com/android/car/dialer/ContactResultsAdapter.java
@@ -18,7 +18,7 @@ package com.android.car.dialer;
 
 import android.database.Cursor;
 import android.net.Uri;
-import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -53,12 +53,12 @@ public class ContactResultsAdapter extends RecyclerView.Adapter<ContactResultVie
         mContacts.clear();
 
         while (data.moveToNext()) {
-            int idColIdx = data.getColumnIndex(ContactsContract.Contacts._ID);
-            int lookupColIdx = data.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
-            int nameColIdx = data.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME);
-            int photoUriColIdx = data.getColumnIndex(ContactsContract.Contacts.PHOTO_URI);
+            int idColIdx = data.getColumnIndex(Contacts._ID);
+            int lookupColIdx = data.getColumnIndex(Contacts.LOOKUP_KEY);
+            int nameColIdx = data.getColumnIndex(Contacts.DISPLAY_NAME);
+            int photoUriColIdx = data.getColumnIndex(Contacts.PHOTO_URI);
 
-            Uri lookupUri = ContactsContract.Contacts.getLookupUri(
+            Uri lookupUri = Contacts.getLookupUri(
                     data.getLong(idColIdx), data.getString(lookupColIdx));
 
             mContacts.add(new ContactResultViewHolder.ContactDetails(
diff --git a/src/com/android/car/dialer/ContactResultsFragment.java b/src/com/android/car/dialer/ContactResultsFragment.java
index 9fefdfb0..062c8b24 100644
--- a/src/com/android/car/dialer/ContactResultsFragment.java
+++ b/src/com/android/car/dialer/ContactResultsFragment.java
@@ -22,7 +22,7 @@ import android.content.CursorLoader;
 import android.content.Loader;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -30,6 +30,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.net.Uri;
 
 import com.android.car.view.PagedListView;
 
@@ -47,19 +48,12 @@ public class ContactResultsFragment extends Fragment implements
     private static final String KEY_INITIAL_SEARCH_QUERY = "initial_search_query";
 
     private static final String[] CONTACT_DETAILS_PROJECTION = {
-            ContactsContract.Contacts._ID,
-            ContactsContract.Contacts.LOOKUP_KEY,
-            ContactsContract.Contacts.DISPLAY_NAME,
-            ContactsContract.Contacts.PHOTO_URI
+            Contacts._ID,
+            Contacts.LOOKUP_KEY,
+            Contacts.DISPLAY_NAME,
+            Contacts.PHOTO_URI
     };
 
-    /**
-     * A selection criteria to filter contacts based on the query given by {@link #mSearchQuery}.
-     * That query is assumed to be the name of a contact.
-     */
-    private static final String CONTACT_SELECTION =
-            ContactsContract.Contacts.DISPLAY_NAME + " LIKE ? ";
-
     private final ContactResultsAdapter mAdapter = new ContactResultsAdapter();
     private PagedListView mContactResultList;
     private String mSearchQuery;
@@ -144,15 +138,26 @@ public class ContactResultsFragment extends Fragment implements
         data.close();
     }
 
+    /**
+     * Finds the contacts with any field that matches the search query. Typically, the search
+     * criteria appears to be matching the beginning of the value in that data field (name, phone
+     * number, etc.)
+     */
     @Override
     public Loader<Cursor> onCreateLoader(int loaderId, Bundle args) {
         if (Log.isLoggable(TAG, Log.DEBUG)) {
             Log.d(TAG, "onCreateLoader(); loaderId: " + loaderId + " with query: " + mSearchQuery);
         }
 
-        return new CursorLoader(getContext(), ContactsContract.Contacts.CONTENT_URI,
-                CONTACT_DETAILS_PROJECTION, CONTACT_SELECTION,
-                new String[] { "%" + mSearchQuery + "%" }, null);
+        /* To lookup against all fields, just append the search query to the content filter uri
+         * and perform a lookup without any selection
+         */
+        Uri lookupUri = Uri.withAppendedPath(Contacts.CONTENT_FILTER_URI,
+                Uri.encode(mSearchQuery));
+
+        return new CursorLoader(getContext(), lookupUri,
+                CONTACT_DETAILS_PROJECTION, null /* selection */,
+                null /* selectionArgs */, null /* sortOrder */);
     }
 
     @Override