Add GAL support to Dialer

Add BIND_DIRECTORY_SEARCH permission to manifest. Use new methods
for GAL support. Change SmartDialing cursor and adapter to use
PhoneNumberListAdapter projections directly.

Bug:
Change-Id: I5f8181cfeec7adab4865e680ebc85ba2b476fc39

1 files changed, 6 insertions, 6 deletions

diff --git a/src/com/android/dialer/list/SmartDialNumberListAdapter.java b/src/com/android/dialer/list/SmartDialNumberListAdapter.java
index 0413c4ee5..c5ce59af2 100644
--- a/src/com/android/dialer/list/SmartDialNumberListAdapter.java
+++ b/src/com/android/dialer/list/SmartDialNumberListAdapter.java
@@ -26,8 +26,8 @@ import android.util.Log;
 
 import com.android.contacts.common.list.ContactListItemView;
 import com.android.contacts.common.list.PhoneNumberListAdapter;
+import com.android.contacts.common.list.PhoneNumberListAdapter.PhoneQuery;
 import com.android.dialer.dialpad.SmartDialCursorLoader;
-import com.android.dialer.dialpad.SmartDialCursorLoader.SmartDialPhoneQuery;
 import com.android.dialer.dialpad.SmartDialNameMatcher;
 import com.android.dialer.dialpad.SmartDialPrefix;
 import com.android.dialer.dialpad.SmartDialMatchPosition;
@@ -56,7 +56,7 @@ public class SmartDialNumberListAdapter extends PhoneNumberListAdapter{
      */
     public void configureLoader(SmartDialCursorLoader loader) {
         if (DEBUG) {
-            Log.v(TAG, "Congifugure Loader with query" + getQueryString());
+            Log.v(TAG, "Configure Loader with query" + getQueryString());
         }
 
         if (getQueryString() == null) {
@@ -78,19 +78,19 @@ public class SmartDialNumberListAdapter extends PhoneNumberListAdapter{
     protected void setHighlight(ContactListItemView view, Cursor cursor) {
         view.clearHighlightSequences();
 
-        if (mNameMatcher.matches(cursor.getString(SmartDialPhoneQuery.SMARTDIAL_DISPLAY_NAME))) {
+        if (mNameMatcher.matches(cursor.getString(PhoneQuery.DISPLAY_NAME))) {
             final ArrayList<SmartDialMatchPosition> nameMatches = mNameMatcher.getMatchPositions();
             for (SmartDialMatchPosition match:nameMatches) {
                 view.addNameHighlightSequence(match.start, match.end);
                 if (DEBUG) {
-                    Log.v(TAG, cursor.getString(SmartDialPhoneQuery.SMARTDIAL_DISPLAY_NAME) + " " +
+                    Log.v(TAG, cursor.getString(PhoneQuery.DISPLAY_NAME) + " " +
                             mNameMatcher.getQuery() + " " + String.valueOf(match.start));
                 }
             }
         }
 
         final SmartDialMatchPosition numberMatch = mNameMatcher.matchesNumber(cursor.getString(
-                SmartDialPhoneQuery.SMARTDIAL_NUMBER));
+                PhoneQuery.PHONE_NUMBER));
         if (numberMatch != null) {
             view.addNumberHighlightSequence(numberMatch.start, numberMatch.end);
         }
@@ -104,7 +104,7 @@ public class SmartDialNumberListAdapter extends PhoneNumberListAdapter{
     public Uri getDataUri(int position) {
         Cursor cursor = ((Cursor)getItem(position));
         if (cursor != null) {
-            long id = cursor.getLong(SmartDialPhoneQuery.SMARTDIAL_ID);
+            long id = cursor.getLong(PhoneQuery.PHONE_ID);
             return ContentUris.withAppendedId(ContactsContract.Data.CONTENT_URI, id);
         } else {
             Log.w(TAG, "Cursor was null in getDataUri() call. Returning null instead.");