diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-20 21:22:49 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-04-20 21:22:50 +0000 |
| commit | de28902d38d9b0f557df1c68c189e2bd0635709b (patch) | |
| tree | d6fdbfd39d4742e51ed4e9b45967fdf5f32c7996 /InCallUI | |
| parent | d6c77fba628851ce9faf725a59105c4345fa0754 (diff) | |
| parent | 1013a7e881d43a03d785ac2c6c172ccc0d53eecd (diff) | |
Merge "DO NOT MERGE Remove use of ttsSpanAsPhoneNumber" into m-wireless-dev
Diffstat (limited to 'InCallUI')
3 files changed, 5 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index ba9dac505..9d5e2650e 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -372,7 +372,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mPrimaryName.setText(null); } else { mPrimaryName.setText(nameIsNumber - ? PhoneNumberUtils.ttsSpanAsPhoneNumber(name) + ? PhoneNumberUtils.getPhoneTtsSpannable(name) : name); // Set direction of the name field @@ -398,7 +398,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr 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); } @@ -457,7 +457,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mSecondaryCallVideoCallIcon.setVisibility(isVideoCall ? View.VISIBLE : View.GONE); mSecondaryCallName.setText(nameIsNumber - ? PhoneNumberUtils.ttsSpanAsPhoneNumber(name) + ? PhoneNumberUtils.getPhoneTtsSpannable(name) : name); if (hasProvider) { mSecondaryCallProviderLabel.setText(providerLabel); diff --git a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java index 7825dc1ad..62c1214c7 100644 --- a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java +++ b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java @@ -418,7 +418,7 @@ public class ConferenceParticipantListAdapter extends BaseAdapter { 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); } diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java index cdf331263..1adba7ad2 100644 --- a/InCallUI/src/com/android/incallui/DialpadFragment.java +++ b/InCallUI/src/com/android/incallui/DialpadFragment.java @@ -514,7 +514,7 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese * @param text Text to set Dialpad EditText to. */ public void setDtmfText(String text) { - mDtmfDialerField.setText(PhoneNumberUtils.ttsSpanAsPhoneNumber(text)); + mDtmfDialerField.setText(PhoneNumberUtils.getPhoneTtsSpannable(text)); } @Override |