[1/2] Use provider string instead of user name

Use provider string instead of user name for search extra number field

Ticket CD-333
Change-Id: I6ae2e716ad03a06478b1e3e773a24456a9b44aa0

2 files changed, 2 insertions, 16 deletions

diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index 7db7a0a9..e330d455 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -1079,8 +1079,7 @@ public class ContactListItemView extends ViewGroup
     }
 
     /**
-     * Sets phone number for a list item. This takes care of number highlighting if the highlight
-     * mask exists.
+     * Sets phone number for a list item.
      */
     public void setExtraNumber(String text) {
         if (TextUtils.isEmpty(text)) {
@@ -1090,20 +1089,7 @@ public class ContactListItemView extends ViewGroup
         } else {
             getCallProviderView();
 
-            // TODO: Format number using PhoneNumberUtils.formatNumber before assigning it to
-            // mDataView. Make sure that determination of the highlight sequences are done only
-            // after number formatting.
-
-            // Sets phone number texts for display after highlighting it, if applicable.
-            // CharSequence textToSet = text;
             final SpannableString textToSet = new SpannableString(text);
-
-            if (mNumberHighlightSequence.size() != 0) {
-                final HighlightSequence highlightSequence = mNumberHighlightSequence.get(0);
-                mTextHighlighter.applyMaskingHighlight(textToSet, highlightSequence.start,
-                        highlightSequence.end);
-            }
-
             setMarqueeText(mCallProviderView, textToSet);
             mCallProviderView.setVisibility(VISIBLE);
 
diff --git a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
index f95b6baa..1dacfb9a 100644
--- a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -457,7 +457,7 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
         };
     }
 
-    private void bindExtraCallAction(ContactListItemView view, Cursor cursor, int position) {
+    protected void bindExtraCallAction(ContactListItemView view, Cursor cursor, int position) {
         try {
             int columnIndex = cursor.getColumnIndexOrThrow("callable_extra_number");
             final String extra = cursor.getString(columnIndex);