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

Commit 42bab804 authored by Brandon Maxwell's avatar Brandon Maxwell Committed by Android (Google) Code Review
Browse files

Merge "Using Compat code for createTtsSpannable" into ub-contactsdialer-b-dev

parents 26ef98f5 8104b41f

src/com/android/dialer/calllog/CallLogAdapter.java

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.view.View.AccessibilityDelegate; 
import android.view.ViewGroup;

import android.view.accessibility.AccessibilityEvent;



import com.android.contacts.common.compat.PhoneNumberUtilsCompat;

import com.android.contacts.common.preference.ContactsPreferences;

import com.android.contacts.common.util.PermissionsUtil;

import com.android.dialer.PhoneCallDetails;
@@ -465,7 +466,7 @@ public class CallLogAdapter extends GroupingListAdapter 
                    countryIso, cachedContactInfo);

        }

        CharSequence formattedNumber = info.formattedNumber == null

                ? null : PhoneNumberUtils.createTtsSpannable(info.formattedNumber);

                ? null : PhoneNumberUtilsCompat.createTtsSpannable(info.formattedNumber);



        final PhoneCallDetails details = new PhoneCallDetails(

                mContext, number, numberPresentation, formattedNumber,

src/com/android/dialer/calllog/CallLogListItemViewHolder.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; 
import android.support.v7.widget.CardView;

import android.support.v7.widget.RecyclerView;

import android.telecom.PhoneAccountHandle;

import android.telephony.PhoneNumberUtils;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;
@@ -44,6 +43,7 @@ import com.android.contacts.common.ClipboardUtils; 
import com.android.contacts.common.ContactPhotoManager;

import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;

import com.android.contacts.common.compat.CompatUtils;

import com.android.contacts.common.compat.PhoneNumberUtilsCompat;

import com.android.contacts.common.dialog.CallSubjectDialog;

import com.android.contacts.common.testing.NeededForTesting;

import com.android.contacts.common.util.UriUtils;
@@ -287,7 +287,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
        if (callType == CallLog.Calls.VOICEMAIL_TYPE) {

            menu.setHeaderTitle(mContext.getResources().getText(R.string.voicemail));

        } else {

            menu.setHeaderTitle(PhoneNumberUtils.createTtsSpannable(

            menu.setHeaderTitle(PhoneNumberUtilsCompat.createTtsSpannable(

                    BidiFormatter.getInstance().unicodeWrap(number, TextDirectionHeuristics.LTR)));

        }