Rename PhoneNumberUtils APIs

In response to more API review.

And removed unneeded permission from
RequestPermissionsActivity.

Bug: 21571895
Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a

5 files changed, 6 insertions, 10 deletions

diff --git a/src/com/android/contacts/common/activity/RequestPermissionsActivity.java b/src/com/android/contacts/common/activity/RequestPermissionsActivity.java
index 74cb4a6b..f623dccc 100644
--- a/src/com/android/contacts/common/activity/RequestPermissionsActivity.java
+++ b/src/com/android/contacts/common/activity/RequestPermissionsActivity.java
@@ -48,8 +48,6 @@ public class RequestPermissionsActivity extends Activity {
             permission.GET_ACCOUNTS,
             permission.ACCESS_FINE_LOCATION,
             permission.ACCESS_COARSE_LOCATION,
-            permission.READ_PROFILE,
-            permission.WRITE_PROFILE,
             permission.INTERNET,
             permission.NFC,
             permission.READ_PHONE_STATE,
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 831841cd..e0daf037 100644
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -289,7 +289,7 @@ public class ImportExportDialogFragment extends DialogFragment
         return TextUtils.expandTemplate(
                 getString(R.string.import_from_sim_summary),
                 name,
-                PhoneNumberUtils.getPhoneTtsSpannable(record.getNumber()));
+                PhoneNumberUtils.createTtsSpannable(record.getNumber()));
     }
 
     private static class AdapterEntry {
diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index decf30a0..d70aeb5b 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -23,7 +23,6 @@ import android.database.CharArrayBuffer;
 import android.database.Cursor;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
@@ -1097,7 +1096,7 @@ public class ContactListItemView extends ViewGroup
             mSnippetView.setVisibility(VISIBLE);
             if (ContactDisplayUtils.isPossiblePhoneNumber(text)) {
                 // Give the text-to-speech engine a hint that it's a phone number
-                mSnippetView.setContentDescription(PhoneNumberUtils.getPhoneTtsSpannable(text));
+                mSnippetView.setContentDescription(PhoneNumberUtils.createTtsSpannable(text));
             } else {
                 mSnippetView.setContentDescription(null);
             }
@@ -1217,7 +1216,7 @@ public class ContactListItemView extends ViewGroup
         if (ContactDisplayUtils.isPossiblePhoneNumber(name)) {
             // Give the text-to-speech engine a hint that it's a phone number
             mNameTextView.setContentDescription(
-                    PhoneNumberUtils.getPhoneTtsSpannable(name.toString()));
+                    PhoneNumberUtils.createTtsSpannable(name.toString()));
         } else {
             mNameTextView.setContentDescription(null);
         }
diff --git a/src/com/android/contacts/common/util/ContactDisplayUtils.java b/src/com/android/contacts/common/util/ContactDisplayUtils.java
index 25d21a07..ca910248 100644
--- a/src/com/android/contacts/common/util/ContactDisplayUtils.java
+++ b/src/com/android/contacts/common/util/ContactDisplayUtils.java
@@ -214,8 +214,8 @@ public class ContactDisplayUtils {
         int start = phoneNumber == null ? -1 : message.indexOf(phoneNumber);
         while (start >= 0) {
             final int end = start + phoneNumber.length();
-            final TtsSpan ttsSpan = PhoneNumberUtils.getPhoneTtsSpan(phoneNumber);
-            spannable.setSpan(ttsSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            final TtsSpan ttsSpan = PhoneNumberUtils.createTtsSpan(phoneNumber);
+            spannable.setSpan(ttsSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);             // this is consistenly done in a misleading way..
             start = message.indexOf(phoneNumber, end);
         }
         return spannable;
diff --git a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
index 7f141027..aecbd243 100644
--- a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
+++ b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
@@ -21,7 +21,6 @@ import android.telecom.PhoneAccountHandle;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
-import android.app.FragmentManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -216,7 +215,7 @@ public class SelectPhoneAccountDialogFragment extends DialogFragment {
             } else {
                 holder.numberTextView.setVisibility(View.VISIBLE);
                 holder.numberTextView.setText(
-                        PhoneNumberUtils.getPhoneTtsSpannable(
+                        PhoneNumberUtils.createTtsSpannable(
                                 account.getAddress().getSchemeSpecificPart()));
             }
             holder.imageView.setImageDrawable(account.getIcon().loadDrawable(getContext()));