commit 09f573b5d19ac52a19ed61da4c18d3d43a7d64ff
author Wenyi Wang <wenyiw@google.com> Mon Dec 21 11:05:23 2015 -0800
committer Wenyi Wang <wenyiw@google.com> Mon Dec 21 12:15:28 2015 -0800
tree 29c6623baccdce7d715f382b19e9ca38f8855b5e
parent 8efcf7ab41fc5627fbc54b6f3d0313aa2ec1ab49

Backport PhoneNumberUtils methods (1/2)

Used compat methods to handle compatibility and removed a completed TODO.

Bug: 25629359
Change-Id: Iedb6fb694657f201452c28e954d08f2a71470fa6

src/com/android/contacts/editor/RawContactReadOnlyEditorView.java

diff --git a/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java b/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java
index 8c54b05..6e4c055 100644
--- a/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java
+++ b/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java
@@ -25,7 +25,6 @@
 import android.provider.ContactsContract.CommonDataKinds.Photo;
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.RawContacts;
-import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Pair;
@@ -39,6 +38,7 @@
 
 import com.android.contacts.R;
 import com.android.contacts.common.GeoUtil;
+import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.common.model.RawContactModifier;
 import com.android.contacts.common.model.RawContactDelta;
 import com.android.contacts.common.model.ValuesDelta;
@@ -172,7 +172,7 @@
                 if (TextUtils.isEmpty(phoneNumber)) {
                     continue;
                 }
-                final String formattedNumber = PhoneNumberUtils.formatNumber(
+                final String formattedNumber = PhoneNumberUtilsCompat.formatNumber(
                         phoneNumber, phone.getPhoneNormalizedNumber(),
                         GeoUtil.getCurrentCountryIso(getContext()));
                 CharSequence phoneType = null;

src/com/android/contacts/interactions/CallLogInteractionsLoader.java

diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
index 2340d3f..4277a27 100644
--- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
@@ -23,11 +23,11 @@
 import android.database.DatabaseUtils;
 import android.net.Uri;
 import android.provider.CallLog.Calls;
-import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
 import com.google.common.annotations.VisibleForTesting;
 
+import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.common.util.PermissionsUtil;
 
 import java.util.ArrayList;
@@ -107,9 +107,7 @@
     }
 
     private List<ContactInteraction> getCallLogInteractions(String phoneNumber) {
-        // TODO: the phone number added to the ContactInteractions result should retain their
-        // original formatting since TalkBack is not reading the normalized number correctly
-        final String normalizedNumber = PhoneNumberUtils.normalizeNumber(phoneNumber);
+        final String normalizedNumber = PhoneNumberUtilsCompat.normalizeNumber(phoneNumber);
         // If the number contains only symbols, we can skip it
         if (TextUtils.isEmpty(normalizedNumber)) {
             return Collections.emptyList();