diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2015-12-05 00:02:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-05 00:02:35 +0000 |
| commit | e3bfc8aca771b088732a4c135406ae02ac65bbc9 (patch) | |
| tree | d91bb7eb300522a1431e4d8ca0295dc97e880728 | |
| parent | 12b4d95fa0b6489eff52cc861a330b490d48d40d (diff) | |
| parent | 42bab8041d7766d14a5f6cbb51d32007a09ba9dd (diff) | |
Merge "Using Compat code for createTtsSpannable" into ub-contactsdialer-b-dev
am: 42bab8041d
* commit '42bab8041d7766d14a5f6cbb51d32007a09ba9dd':
Using Compat code for createTtsSpannable
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 3 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogListItemViewHolder.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 6f015651c..dac50ff1f 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -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, diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java index d6cb1d433..21f3213a6 100644 --- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java +++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java @@ -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))); } |