Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7d3bee1 authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

Merge "Rename PhoneNumberUtils APIs" into mnc-dev

parents c14fbc8e 5e150bf4

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

+3 −7
Original line number Diff line number Diff line
@@ -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
@@ -457,7 +453,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);

        }
@@ -515,7 +511,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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -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