diff options
| author | Brian Attwell <brianattwell@google.com> | 2015-06-02 22:35:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-02 22:35:59 +0000 |
| commit | 96890cb02b46454a6be490c616380c14485223ce (patch) | |
| tree | dece16bee3e1a33cdf56cf69e75cb9677857528d /InCallUI | |
| parent | 5b031e478b33336d4706770638446faf8045ad7a (diff) | |
| parent | 8b0ac09f1af5d84b9b3e3a18737324ef042f3956 (diff) | |
am cb037b3f: am ba383045: am d2bbd604: Merge "Rename PhoneNumberUtils APIs" into mnc-dev
* commit 'cb037b3f8c3d9967b7be5602869e9c8c36b587be':
Rename PhoneNumberUtils APIs
Diffstat (limited to 'InCallUI')
3 files changed, 5 insertions, 9 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index d67a5f488..a07a44794 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -21,11 +21,7 @@ import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.LayoutTransition; import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; -import android.animation.ValueAnimator.AnimatorUpdateListener; -import android.app.Activity; import android.content.Context; -import android.content.res.Configuration; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; @@ -431,7 +427,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mPrimaryName.setText(null); } else { mPrimaryName.setText(nameIsNumber - ? PhoneNumberUtils.getPhoneTtsSpannable(name) + ? PhoneNumberUtils.createTtsSpannable(name) : name); // Set direction of the name field @@ -463,7 +459,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mPhoneNumber.setText(null); mPhoneNumber.setVisibility(View.GONE); } else { - mPhoneNumber.setText(PhoneNumberUtils.getPhoneTtsSpannable(number)); + mPhoneNumber.setText(PhoneNumberUtils.createTtsSpannable(number)); mPhoneNumber.setVisibility(View.VISIBLE); mPhoneNumber.setTextDirection(View.TEXT_DIRECTION_LTR); } @@ -533,7 +529,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mSecondaryCallVideoCallIcon.setVisibility(isVideoCall ? View.VISIBLE : View.GONE); mSecondaryCallName.setText(nameIsNumber - ? PhoneNumberUtils.getPhoneTtsSpannable(name) + ? PhoneNumberUtils.createTtsSpannable(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 62c1214c7..bff04a1ec 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.getPhoneTtsSpannable(callerNumber)); + numberTextView.setText(PhoneNumberUtils.createTtsSpannable(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 737c86255..abe8fb999 100644 --- a/InCallUI/src/com/android/incallui/DialpadFragment.java +++ b/InCallUI/src/com/android/incallui/DialpadFragment.java @@ -483,7 +483,7 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese * @param text Text to set Dialpad EditText to. */ public void setDtmfText(String text) { - mDtmfDialerField.setText(PhoneNumberUtils.getPhoneTtsSpannable(text)); + mDtmfDialerField.setText(PhoneNumberUtils.createTtsSpannable(text)); } @Override |