From 122fb0b6c58774c75e06cbf786d0f366b674c163 Mon Sep 17 00:00:00 2001 From: linyuh Date: Mon, 26 Mar 2018 13:35:32 -0700 Subject: Remove obsolete methods in CompatUtils and rename it as "LocaleUtils". Test: Existing tests PiperOrigin-RevId: 190516504 Change-Id: I5fa9e123b45beb9728257ecd160a348fb3f4732c --- java/com/android/dialer/app/DialtactsActivity.java | 6 +++--- .../app/calllog/CallLogListItemViewHolder.java | 5 +---- .../dialer/app/filterednumber/NumbersAdapter.java | 5 +---- .../app/list/PhoneFavoriteSquareTileView.java | 22 ++++++---------------- 4 files changed, 11 insertions(+), 27 deletions(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index 3d61f7371..9057cd9f9 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -92,7 +92,6 @@ import com.android.dialer.common.LogUtil; import com.android.dialer.common.UiUtil; import com.android.dialer.common.concurrent.DialerExecutorComponent; import com.android.dialer.common.concurrent.ThreadUtil; -import com.android.dialer.compat.CompatUtils; import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.constants.ActivityRequestCodes; import com.android.dialer.contactsfragment.ContactsFragment; @@ -103,6 +102,7 @@ import com.android.dialer.dialpadview.DialpadFragment; import com.android.dialer.dialpadview.DialpadFragment.DialpadListener; import com.android.dialer.dialpadview.DialpadFragment.LastOutgoingCallCallback; import com.android.dialer.duo.DuoComponent; +import com.android.dialer.i18n.LocaleUtils; import com.android.dialer.interactions.PhoneNumberInteraction; import com.android.dialer.interactions.PhoneNumberInteraction.InteractionErrorCode; import com.android.dialer.logging.DialerImpression; @@ -538,7 +538,7 @@ public class DialtactsActivity extends TransactionSafeActivity // (1) the activity is not recreated with a new configuration, or // (2) the activity is recreated with a new configuration but the change is a language change. boolean isLanguageChanged = - !CompatUtils.getLocale(this).getISO3Language().equals(savedLanguageCode); + !LocaleUtils.getLocale(this).getISO3Language().equals(savedLanguageCode); if (!wasConfigurationChange || isLanguageChanged) { dialerDatabaseHelper.startSmartDialUpdateThread(/* forceUpdate = */ isLanguageChanged); } @@ -638,7 +638,7 @@ public class DialtactsActivity extends TransactionSafeActivity super.onSaveInstanceState(outState); outState.putString(KEY_SEARCH_QUERY, searchQuery); outState.putString(KEY_DIALPAD_QUERY, dialpadQuery); - outState.putString(KEY_SAVED_LANGUAGE_CODE, CompatUtils.getLocale(this).getISO3Language()); + outState.putString(KEY_SAVED_LANGUAGE_CODE, LocaleUtils.getLocale(this).getISO3Language()); outState.putBoolean(KEY_IN_REGULAR_SEARCH_UI, inRegularSearch); outState.putBoolean(KEY_IN_DIALPAD_SEARCH_UI, inDialpadSearch); outState.putBoolean(KEY_IN_NEW_SEARCH_UI, inNewSearch); diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index 8fbc459ca..3f7def953 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -71,7 +71,6 @@ import com.android.dialer.clipboard.ClipboardUtils; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.common.concurrent.AsyncTaskExecutors; -import com.android.dialer.compat.CompatUtils; import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.constants.ActivityRequestCodes; import com.android.dialer.contactphoto.ContactPhotoManager; @@ -309,9 +308,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder } quickContactView.setOverlay(null); - if (CompatUtils.hasPrioritizedMimeType()) { - quickContactView.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE); - } + quickContactView.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE); primaryActionButtonView.setOnClickListener(this); primaryActionView.setOnClickListener(this.expandCollapseListener); if (this.voicemailPlaybackPresenter != null diff --git a/java/com/android/dialer/app/filterednumber/NumbersAdapter.java b/java/com/android/dialer/app/filterednumber/NumbersAdapter.java index 3acb204e0..2c08558ec 100644 --- a/java/com/android/dialer/app/filterednumber/NumbersAdapter.java +++ b/java/com/android/dialer/app/filterednumber/NumbersAdapter.java @@ -27,7 +27,6 @@ import android.widget.QuickContactBadge; import android.widget.SimpleCursorAdapter; import android.widget.TextView; import com.android.dialer.app.R; -import com.android.dialer.compat.CompatUtils; import com.android.dialer.contactphoto.ContactPhotoManager; import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest; import com.android.dialer.lettertile.LetterTileDrawable; @@ -63,9 +62,7 @@ public class NumbersAdapter extends SimpleCursorAdapter { final QuickContactBadge quickContactBadge = (QuickContactBadge) view.findViewById(R.id.quick_contact_photo); quickContactBadge.setOverlay(null); - if (CompatUtils.hasPrioritizedMimeType()) { - quickContactBadge.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE); - } + quickContactBadge.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE); ContactInfo info = contactInfoHelper.lookupNumber(number, countryIso); if (info == null) { diff --git a/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java b/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java index 6096ca872..6b41547c2 100644 --- a/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java +++ b/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java @@ -25,7 +25,6 @@ import android.widget.ImageButton; import android.widget.TextView; import com.android.contacts.common.list.ContactEntry; import com.android.dialer.app.R; -import com.android.dialer.compat.CompatUtils; import com.android.dialer.logging.InteractionEvent; import com.android.dialer.logging.Logger; import com.android.dialer.widget.BidiTextView; @@ -64,21 +63,12 @@ public class PhoneFavoriteSquareTileView extends PhoneFavoriteTileView { } private void launchQuickContact() { - if (CompatUtils.hasPrioritizedMimeType()) { - QuickContact.showQuickContact( - getContext(), - PhoneFavoriteSquareTileView.this, - getLookupUri(), - null, - Phone.CONTENT_ITEM_TYPE); - } else { - QuickContact.showQuickContact( - getContext(), - PhoneFavoriteSquareTileView.this, - getLookupUri(), - QuickContact.MODE_LARGE, - null); - } + QuickContact.showQuickContact( + getContext(), + PhoneFavoriteSquareTileView.this, + getLookupUri(), + null, + Phone.CONTENT_ITEM_TYPE); } @Override -- cgit v1.2.3