From b06d00924123aa13086be564fee6404215fcc0d5 Mon Sep 17 00:00:00 2001 From: linyuh Date: Thu, 1 Mar 2018 15:05:36 -0800 Subject: Disable phone number formatting for devices with Argentinian SIMs. Bug: 73718977 Test: PhoneNumberHelperTest PiperOrigin-RevId: 187540382 Change-Id: I814ec62b2215c24b8cde3442c5dc83d98ad87164 --- java/com/android/incallui/CallCardPresenter.java | 2 +- java/com/android/incallui/ConferenceParticipantListAdapter.java | 4 ++-- java/com/android/incallui/ContactInfoCache.java | 6 +++--- java/com/android/incallui/DialpadFragment.java | 4 ++-- java/com/android/incallui/contactgrid/ContactGridManager.java | 4 ++-- java/com/android/incallui/spam/SpamCallListListener.java | 7 ++++--- java/com/android/incallui/spam/SpamNotificationActivity.java | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) (limited to 'java/com/android/incallui') diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index c60da63d6..8eb07c579 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -483,7 +483,7 @@ public class CallCardPresenter .setCallSubject(shouldShowCallSubject(primary) ? primary.getCallSubject() : null) .setCallbackNumber( PhoneNumberHelper.formatNumber( - primary.getCallbackNumber(), primary.getSimCountryIso())) + context, primary.getCallbackNumber(), primary.getSimCountryIso())) .setIsWifi(primary.hasProperty(Details.PROPERTY_WIFI)) .setIsConference( primary.isConferenceCall() diff --git a/java/com/android/incallui/ConferenceParticipantListAdapter.java b/java/com/android/incallui/ConferenceParticipantListAdapter.java index d4579b1ed..4780974ef 100644 --- a/java/com/android/incallui/ConferenceParticipantListAdapter.java +++ b/java/com/android/incallui/ConferenceParticipantListAdapter.java @@ -20,6 +20,7 @@ import android.content.Context; import android.net.Uri; import android.support.annotation.Nullable; import android.support.v4.util.ArrayMap; +import android.telephony.PhoneNumberUtils; import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; @@ -32,7 +33,6 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.contacts.common.preference.ContactsPreferences; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.common.LogUtil; @@ -341,7 +341,7 @@ public class ConferenceParticipantListAdapter extends BaseAdapter { } else { numberTextView.setVisibility(View.VISIBLE); numberTextView.setText( - PhoneNumberUtilsCompat.createTtsSpannable( + PhoneNumberUtils.createTtsSpannable( BidiFormatter.getInstance().unicodeWrap(callerNumber, TextDirectionHeuristics.LTR))); } } diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java index d2ae70939..90513381e 100644 --- a/java/com/android/incallui/ContactInfoCache.java +++ b/java/com/android/incallui/ContactInfoCache.java @@ -214,7 +214,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { // No name, but we do have a valid CNAP name, so use that. displayName = info.cnapName; info.name = info.cnapName; - displayNumber = PhoneNumberHelper.formatNumber(number, info.countryIso); + displayNumber = PhoneNumberHelper.formatNumber(context, number, info.countryIso); Log.d( TAG, " ==> cnapName available: displayName '" @@ -227,7 +227,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { // case when an incoming call doesn't match any contact, // or if you manually dial an outgoing number using the // dialpad. - displayNumber = PhoneNumberHelper.formatNumber(number, info.countryIso); + displayNumber = PhoneNumberHelper.formatNumber(context, number, info.countryIso); Log.d( TAG, @@ -252,7 +252,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { // later determine whether to use the name or nameAlternative when presenting displayName = info.name; cce.nameAlternative = info.nameAlternative; - displayNumber = PhoneNumberHelper.formatNumber(number, info.countryIso); + displayNumber = PhoneNumberHelper.formatNumber(context, number, info.countryIso); label = info.phoneLabel; Log.d( TAG, diff --git a/java/com/android/incallui/DialpadFragment.java b/java/com/android/incallui/DialpadFragment.java index c5b9d785f..44eaf212a 100644 --- a/java/com/android/incallui/DialpadFragment.java +++ b/java/com/android/incallui/DialpadFragment.java @@ -18,6 +18,7 @@ package com.android.incallui; import android.content.Context; import android.os.Bundle; +import android.telephony.PhoneNumberUtils; import android.util.ArrayMap; import android.util.AttributeSet; import android.view.KeyEvent; @@ -29,7 +30,6 @@ import android.view.ViewGroup; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.dialer.common.LogUtil; import com.android.dialer.dialpadview.DialpadKeyButton; import com.android.dialer.dialpadview.DialpadKeyButton.OnPressedListener; @@ -199,7 +199,7 @@ public class DialpadFragment extends BaseFragment * @param text Text to set Dialpad EditText to. */ public void setDtmfText(String text) { - dtmfDialerField.setText(PhoneNumberUtilsCompat.createTtsSpannable(text)); + dtmfDialerField.setText(PhoneNumberUtils.createTtsSpannable(text)); } /** Starts the slide up animation for the Dialpad keys when the Dialpad is revealed. */ diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java index 1b76958dc..327eaf2b8 100644 --- a/java/com/android/incallui/contactgrid/ContactGridManager.java +++ b/java/com/android/incallui/contactgrid/ContactGridManager.java @@ -22,6 +22,7 @@ import android.graphics.drawable.Drawable; import android.os.SystemClock; import android.support.annotation.Nullable; import android.support.v4.view.ViewCompat; +import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.view.View; import android.view.accessibility.AccessibilityEvent; @@ -30,7 +31,6 @@ import android.widget.ImageView; import android.widget.Space; import android.widget.TextView; import android.widget.ViewAnimator; -import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.lettertile.LetterTileDrawable; @@ -276,7 +276,7 @@ public class ContactGridManager { } else { contactNameTextView.setText( primaryInfo.nameIsNumber() - ? PhoneNumberUtilsCompat.createTtsSpannable(primaryInfo.name()) + ? PhoneNumberUtils.createTtsSpannable(primaryInfo.name()) : primaryInfo.name()); // Set direction of the name field diff --git a/java/com/android/incallui/spam/SpamCallListListener.java b/java/com/android/incallui/spam/SpamCallListListener.java index c7fa498e1..22b383332 100644 --- a/java/com/android/incallui/spam/SpamCallListListener.java +++ b/java/com/android/incallui/spam/SpamCallListListener.java @@ -34,7 +34,6 @@ import android.support.v4.os.BuildCompat; import android.telecom.DisconnectCause; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; -import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.dialer.blocking.FilteredNumberCompat; import com.android.dialer.blocking.FilteredNumbersUtil; import com.android.dialer.common.Assert; @@ -47,6 +46,7 @@ import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.notification.DialerNotificationManager; import com.android.dialer.notification.NotificationChannelId; +import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.spam.SpamComponent; import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.util.PermissionsUtil; @@ -267,8 +267,9 @@ public class SpamCallListListener implements CallList.Listener { private CharSequence getDisplayNumber(DialerCall call) { String formattedNumber = - PhoneNumberUtils.formatNumber(call.getNumber(), GeoUtil.getCurrentCountryIso(context)); - return PhoneNumberUtilsCompat.createTtsSpannable(formattedNumber); + PhoneNumberHelper.formatNumber( + context, call.getNumber(), GeoUtil.getCurrentCountryIso(context)); + return PhoneNumberUtils.createTtsSpannable(formattedNumber); } /** Display a notification with two actions: "add contact" and "report spam". */ diff --git a/java/com/android/incallui/spam/SpamNotificationActivity.java b/java/com/android/incallui/spam/SpamNotificationActivity.java index 6ba7c30f8..8919dc713 100644 --- a/java/com/android/incallui/spam/SpamNotificationActivity.java +++ b/java/com/android/incallui/spam/SpamNotificationActivity.java @@ -27,7 +27,6 @@ import android.provider.CallLog; import android.provider.ContactsContract; import android.support.v4.app.FragmentActivity; import android.telephony.PhoneNumberUtils; -import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.dialer.blocking.BlockedNumbersMigrator; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.blocking.FilteredNumberCompat; @@ -39,6 +38,7 @@ import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.logging.ReportingLocation; import com.android.dialer.notification.DialerNotificationManager; +import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.spam.SpamComponent; import com.android.incallui.call.DialerCall; @@ -109,8 +109,8 @@ public class SpamNotificationActivity extends FragmentActivity { /** Returns the formatted version of the given number. */ private static String getFormattedNumber(String number, Context context) { String formattedNumber = - PhoneNumberUtils.formatNumber(number, GeoUtil.getCurrentCountryIso(context)); - return PhoneNumberUtilsCompat.createTtsSpannable(formattedNumber).toString(); + PhoneNumberHelper.formatNumber(context, number, GeoUtil.getCurrentCountryIso(context)); + return PhoneNumberUtils.createTtsSpannable(formattedNumber).toString(); } private void logCallImpression(DialerImpression.Type impression) { -- cgit v1.2.3