commit cb857b2eda1ce501975b64e979b6f529253e1665
author Yorke Lee <yorkelee@google.com> Wed Feb 25 17:22:40 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 25 17:24:11 2015 +0000
tree 1ef8cb5e9c37368ced96a0d58e4905a2afbb1aec
parent 61e694df61e210e5006278db7f8682bfcf1a2300
parent 27b0dad9978e7ffa3ca2aa59e0948481c471556a

Merge "Remove use of ttsSpanAsPhoneNumber"

InCallUI/src/com/android/incallui/CallCardFragment.java

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 81b9ff7..649176c 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -378,7 +378,7 @@
             mPrimaryName.setText(null);
         } else {
             mPrimaryName.setText(nameIsNumber
-                    ? PhoneNumberUtils.ttsSpanAsPhoneNumber(name)
+                    ? PhoneNumberUtils.getPhoneTtsSpannable(name)
                     : name);
 
             // Set direction of the name field
@@ -404,7 +404,7 @@
             mPhoneNumber.setText(null);
             mPhoneNumber.setVisibility(View.GONE);
         } else {
-            mPhoneNumber.setText(PhoneNumberUtils.ttsSpanAsPhoneNumber(number));
+            mPhoneNumber.setText(PhoneNumberUtils.getPhoneTtsSpannable(number));
             mPhoneNumber.setVisibility(View.VISIBLE);
             mPhoneNumber.setTextDirection(View.TEXT_DIRECTION_LTR);
         }
@@ -462,7 +462,7 @@
             mSecondaryCallConferenceCallIcon.setVisibility(isConference ? View.VISIBLE : View.GONE);
 
             mSecondaryCallName.setText(nameIsNumber
-                    ? PhoneNumberUtils.ttsSpanAsPhoneNumber(name)
+                    ? PhoneNumberUtils.getPhoneTtsSpannable(name)
                     : name);
             if (hasProvider) {
                 mSecondaryCallProviderLabel.setText(providerLabel);

InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java

diff --git a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
index 7825dc1..62c1214 100644
--- a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
@@ -418,7 +418,7 @@
             numberTypeTextView.setVisibility(View.GONE);
         } else {
             numberTextView.setVisibility(View.VISIBLE);
-            numberTextView.setText(PhoneNumberUtils.ttsSpanAsPhoneNumber(callerNumber));
+            numberTextView.setText(PhoneNumberUtils.getPhoneTtsSpannable(callerNumber));
             numberTypeTextView.setVisibility(View.VISIBLE);
             numberTypeTextView.setText(callerNumberType);
         }

InCallUI/src/com/android/incallui/DialpadFragment.java

diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index 7c5b358..611815a 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -490,7 +490,7 @@
      * @param text Text to set Dialpad EditText to.
      */
     public void setDtmfText(String text) {
-        mDtmfDialerField.setText(PhoneNumberUtils.ttsSpanAsPhoneNumber(text));
+        mDtmfDialerField.setText(PhoneNumberUtils.getPhoneTtsSpannable(text));
     }
 
     @Override