Fixed getTtsSpannedPhoneNumber() name changed merge error am: f0017b72f4

am: 415d6da854

* commit '415d6da854af5311d50503afde89d3d4b235209e':
  Fixed getTtsSpannedPhoneNumber() name changed merge error

5 files changed, 15 insertions, 15 deletions

diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 5d1bc917f..6ca5ef58e 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -475,7 +475,7 @@ public class SpecialCharSequenceMgr {
 
                     // display the name as a toast
                     Context context = sc.progressDialog.getContext();
-                    CharSequence msg = ContactDisplayUtils.getTtsSpannedPhoneNumberString(
+                    CharSequence msg = ContactDisplayUtils.getTtsSpannedPhoneNumber(
                             context.getResources(), R.string.menu_callNumber, name);
                     Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
                 }
diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index eccad58b3..c40c99384 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -19,6 +19,8 @@ package com.android.dialer.calllog;
 import static android.Manifest.permission.READ_CALL_LOG;
 import static android.Manifest.permission.READ_CONTACTS;
 
+import com.google.common.collect.Maps;
+
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -40,10 +42,8 @@ import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.contacts.common.util.PermissionsUtil;
 import com.android.dialer.DialtactsActivity;
 import com.android.dialer.R;
-import com.android.dialer.calllog.PhoneAccountUtils;
 import com.android.dialer.filterednumber.FilteredNumbersUtil;
 import com.android.dialer.list.ListsFragment;
-import com.google.common.collect.Maps;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -214,7 +214,7 @@ public class DefaultVoicemailNotifier {
 
         // The text to show in the ticker, describing the new event.
         if (callToNotify != null) {
-            CharSequence msg = ContactDisplayUtils.getTtsSpannedPhoneNumberString(
+            CharSequence msg = ContactDisplayUtils.getTtsSpannedPhoneNumber(
                     resources,
                     R.string.notification_new_voicemail_ticker,
                     names.get(callToNotify.number));
diff --git a/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java b/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java
index abc502f6a..792cead32 100644
--- a/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java
+++ b/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java
@@ -134,13 +134,13 @@ public class BlockNumberDialogFragment extends DialogFragment
         String okText;
         String message;
         if (isBlocked) {
-            title = ContactDisplayUtils.getTtsSpannedPhoneNumberString(getResources(),
+            title = ContactDisplayUtils.getTtsSpannedPhoneNumber(getResources(),
                     R.string.unblock_number_confirmation_title,
                     mDisplayNumber);
             okText = getString(R.string.unblock_number_ok);
             message = null;
         } else {
-            title = ContactDisplayUtils.getTtsSpannedPhoneNumberString(getResources(),
+            title = ContactDisplayUtils.getTtsSpannedPhoneNumber(getResources(),
                     R.string.block_number_confirmation_title,
                     mDisplayNumber);
             okText = getString(R.string.block_number_ok);
@@ -180,7 +180,7 @@ public class BlockNumberDialogFragment extends DialogFragment
         if (!FilteredNumbersUtil.canBlockNumber(getActivity(), mNumber, mCountryIso)) {
             dismiss();
             Toast.makeText(getContext(),
-                    ContactDisplayUtils.getTtsSpannedPhoneNumberString(
+                    ContactDisplayUtils.getTtsSpannedPhoneNumber(
                             getResources(), R.string.invalidNumber, mDisplayNumber),
                     Toast.LENGTH_SHORT).show();
         }
@@ -200,12 +200,12 @@ public class BlockNumberDialogFragment extends DialogFragment
     }
 
     private CharSequence getBlockedMessage() {
-        return ContactDisplayUtils.getTtsSpannedPhoneNumberString(getResources(),
+        return ContactDisplayUtils.getTtsSpannedPhoneNumber(getResources(),
                 R.string.snackbar_number_blocked, mDisplayNumber);
     }
 
     private CharSequence getUnblockedMessage() {
-        return ContactDisplayUtils.getTtsSpannedPhoneNumberString(getResources(),
+        return ContactDisplayUtils.getTtsSpannedPhoneNumber(getResources(),
                 R.string.snackbar_number_unblocked, mDisplayNumber);
     }
 
diff --git a/src/com/android/dialer/list/BlockedListSearchFragment.java b/src/com/android/dialer/list/BlockedListSearchFragment.java
index a54a72173..bddd3d49d 100644
--- a/src/com/android/dialer/list/BlockedListSearchFragment.java
+++ b/src/com/android/dialer/list/BlockedListSearchFragment.java
@@ -187,7 +187,7 @@ public class BlockedListSearchFragment extends RegularSearchFragment
                             BlockedListSearchFragment.this);
                 } else {
                     Toast.makeText(getContext(),
-                            ContactDisplayUtils.getTtsSpannedPhoneNumberString(getResources(),
+                            ContactDisplayUtils.getTtsSpannedPhoneNumber(getResources(),
                                     R.string.alreadyBlocked, number),
                             Toast.LENGTH_SHORT).show();
                 }
@@ -197,7 +197,7 @@ public class BlockedListSearchFragment extends RegularSearchFragment
                 onCheckListener, number, countryIso);
         if (!success) {
             Toast.makeText(getContext(),
-                    ContactDisplayUtils.getTtsSpannedPhoneNumberString(
+                    ContactDisplayUtils.getTtsSpannedPhoneNumber(
                             getResources(), R.string.invalidNumber, number),
                     Toast.LENGTH_SHORT).show();
         }
@@ -223,7 +223,7 @@ public class BlockedListSearchFragment extends RegularSearchFragment
             final String number,
             final Integer blockId) {
         if (blockId != null) {
-            Toast.makeText(getContext(), ContactDisplayUtils.getTtsSpannedPhoneNumberString(
+            Toast.makeText(getContext(), ContactDisplayUtils.getTtsSpannedPhoneNumber(
                             getResources(), R.string.alreadyBlocked, number),
                     Toast.LENGTH_SHORT).show();
             return;
diff --git a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
index 9e75b2b7d..488bb33f9 100644
--- a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
+++ b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
@@ -148,9 +148,9 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter {
         final String number = getFormattedQueryString();
         switch (shortcutType) {
             case SHORTCUT_DIRECT_CALL:
-                text = ContactDisplayUtils.getTtsSpannedPhoneNumberString(resources,
-                                R.string.search_shortcut_call_number,
-                                mBidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR));
+                text = ContactDisplayUtils.getTtsSpannedPhoneNumber(resources,
+                        R.string.search_shortcut_call_number,
+                        mBidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR));
                 drawableId = R.drawable.ic_search_phone;
                 break;
             case SHORTCUT_CREATE_NEW_CONTACT: