From 183cb71663320f16149d83eeebaff7795a4b55f2 Mon Sep 17 00:00:00 2001 From: linyuh Date: Wed, 27 Dec 2017 17:02:37 -0800 Subject: Remove field prefixes. Test: Existing tests PiperOrigin-RevId: 180230450 Change-Id: I0b2589cfeeaef81e42a04efa48af24b4e4d0e95f --- .../app/filterednumber/BlockedNumbersFragment.java | 52 +++++++++++----------- .../dialer/app/filterednumber/NumbersAdapter.java | 36 +++++++-------- .../ViewNumbersToImportFragment.java | 12 ++--- 3 files changed, 50 insertions(+), 50 deletions(-) (limited to 'java/com/android/dialer/app/filterednumber') diff --git a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java index 36afe5429..cae35d5b6 100644 --- a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java +++ b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java @@ -53,11 +53,11 @@ public class BlockedNumbersFragment extends ListFragment private BlockedNumbersMigrator blockedNumbersMigratorForTest; private TextView blockedNumbersText; private TextView footerText; - private BlockedNumbersAdapter mAdapter; - private VisualVoicemailEnabledChecker mVoicemailEnabledChecker; - private View mImportSettings; - private View mBlockedNumbersDisabledForEmergency; - private View mBlockedNumberListDivider; + private BlockedNumbersAdapter adapter; + private VisualVoicemailEnabledChecker voicemailEnabledChecker; + private View importSettings; + private View blockedNumbersDisabledForEmergency; + private View blockedNumberListDivider; @Override public Context getContext() { @@ -81,27 +81,27 @@ public class BlockedNumbersFragment extends ListFragment drawable.setIsCircular(true); addNumberIcon.setImageDrawable(drawable); - if (mAdapter == null) { - mAdapter = + if (adapter == null) { + adapter = BlockedNumbersAdapter.newBlockedNumbersAdapter( getContext(), getActivity().getFragmentManager()); } - setListAdapter(mAdapter); + setListAdapter(adapter); blockedNumbersText = (TextView) getListView().findViewById(R.id.blocked_number_text_view); migratePromoView = getListView().findViewById(R.id.migrate_promo); getListView().findViewById(R.id.migrate_promo_allow_button).setOnClickListener(this); - mImportSettings = getListView().findViewById(R.id.import_settings); - mBlockedNumbersDisabledForEmergency = + importSettings = getListView().findViewById(R.id.import_settings); + blockedNumbersDisabledForEmergency = getListView().findViewById(R.id.blocked_numbers_disabled_for_emergency); - mBlockedNumberListDivider = getActivity().findViewById(R.id.blocked_number_list_divider); + blockedNumberListDivider = getActivity().findViewById(R.id.blocked_number_list_divider); getListView().findViewById(R.id.import_button).setOnClickListener(this); getListView().findViewById(R.id.view_numbers_button).setOnClickListener(this); getListView().findViewById(R.id.add_number_linear_layout).setOnClickListener(this); footerText = (TextView) getActivity().findViewById(R.id.blocked_number_footer_textview); - mVoicemailEnabledChecker = new VisualVoicemailEnabledChecker(getContext(), this); - mVoicemailEnabledChecker.asyncUpdate(); + voicemailEnabledChecker = new VisualVoicemailEnabledChecker(getContext(), this); + voicemailEnabledChecker.asyncUpdate(); updateActiveVoicemailProvider(); } @@ -139,11 +139,11 @@ public class BlockedNumbersFragment extends ListFragment blockedNumbersText.setVisibility(View.GONE); getListView().findViewById(R.id.add_number_linear_layout).setVisibility(View.GONE); getListView().findViewById(R.id.add_number_linear_layout).setOnClickListener(null); - mBlockedNumberListDivider.setVisibility(View.GONE); - mImportSettings.setVisibility(View.GONE); + blockedNumberListDivider.setVisibility(View.GONE); + importSettings.setVisibility(View.GONE); getListView().findViewById(R.id.import_button).setOnClickListener(null); getListView().findViewById(R.id.view_numbers_button).setOnClickListener(null); - mBlockedNumbersDisabledForEmergency.setVisibility(View.GONE); + blockedNumbersDisabledForEmergency.setVisibility(View.GONE); footerText.setVisibility(View.GONE); } else { FilteredNumbersUtil.checkForSendToVoicemailContact( @@ -152,7 +152,7 @@ public class BlockedNumbersFragment extends ListFragment @Override public void onComplete(boolean hasSendToVoicemailContact) { final int visibility = hasSendToVoicemailContact ? View.VISIBLE : View.GONE; - mImportSettings.setVisibility(visibility); + importSettings.setVisibility(visibility); } }); } @@ -160,12 +160,12 @@ public class BlockedNumbersFragment extends ListFragment // All views except migrate and the block list are hidden when new filtering is available if (!FilteredNumberCompat.canUseNewFiltering() && FilteredNumbersUtil.hasRecentEmergencyCall(getContext())) { - mBlockedNumbersDisabledForEmergency.setVisibility(View.VISIBLE); + blockedNumbersDisabledForEmergency.setVisibility(View.VISIBLE); } else { - mBlockedNumbersDisabledForEmergency.setVisibility(View.GONE); + blockedNumbersDisabledForEmergency.setVisibility(View.GONE); } - mVoicemailEnabledChecker.asyncUpdate(); + voicemailEnabledChecker.asyncUpdate(); } @Override @@ -197,17 +197,17 @@ public class BlockedNumbersFragment extends ListFragment @Override public void onLoadFinished(Loader loader, Cursor data) { - mAdapter.swapCursor(data); + adapter.swapCursor(data); if (FilteredNumberCompat.canUseNewFiltering() || data.getCount() == 0) { - mBlockedNumberListDivider.setVisibility(View.INVISIBLE); + blockedNumberListDivider.setVisibility(View.INVISIBLE); } else { - mBlockedNumberListDivider.setVisibility(View.VISIBLE); + blockedNumberListDivider.setVisibility(View.VISIBLE); } } @Override public void onLoaderReset(Loader loader) { - mAdapter.swapCursor(null); + adapter.swapCursor(null); } @Override @@ -228,7 +228,7 @@ public class BlockedNumbersFragment extends ListFragment new ImportSendToVoicemailContactsListener() { @Override public void onImportComplete() { - mImportSettings.setVisibility(View.GONE); + importSettings.setVisibility(View.GONE); } }); } else if (resId == R.id.migrate_promo_allow_button) { @@ -259,7 +259,7 @@ public class BlockedNumbersFragment extends ListFragment if (getActivity() == null || getActivity().isFinishing()) { return; } - if (mVoicemailEnabledChecker.isVisualVoicemailEnabled()) { + if (voicemailEnabledChecker.isVisualVoicemailEnabled()) { footerText.setText(R.string.block_number_footer_message_vvm); } else { footerText.setText(R.string.block_number_footer_message_no_vvm); diff --git a/java/com/android/dialer/app/filterednumber/NumbersAdapter.java b/java/com/android/dialer/app/filterednumber/NumbersAdapter.java index bdd6dcee8..3acb204e0 100644 --- a/java/com/android/dialer/app/filterednumber/NumbersAdapter.java +++ b/java/com/android/dialer/app/filterednumber/NumbersAdapter.java @@ -39,11 +39,11 @@ import com.android.dialer.util.UriUtils; /** TODO(calderwoodra): documentation */ public class NumbersAdapter extends SimpleCursorAdapter { - private final Context mContext; - private final FragmentManager mFragmentManager; - private final ContactInfoHelper mContactInfoHelper; - private final BidiFormatter mBidiFormatter = BidiFormatter.getInstance(); - private final ContactPhotoManager mContactPhotoManager; + private final Context context; + private final FragmentManager fragmentManager; + private final ContactInfoHelper contactInfoHelper; + private final BidiFormatter bidiFormatter = BidiFormatter.getInstance(); + private final ContactPhotoManager contactPhotoManager; public NumbersAdapter( Context context, @@ -51,10 +51,10 @@ public class NumbersAdapter extends SimpleCursorAdapter { ContactInfoHelper contactInfoHelper, ContactPhotoManager contactPhotoManager) { super(context, R.layout.blocked_number_item, null, new String[] {}, new int[] {}, 0); - mContext = context; - mFragmentManager = fragmentManager; - mContactInfoHelper = contactInfoHelper; - mContactPhotoManager = contactPhotoManager; + this.context = context; + this.fragmentManager = fragmentManager; + this.contactInfoHelper = contactInfoHelper; + this.contactPhotoManager = contactPhotoManager; } public void updateView(View view, String number, String countryIso) { @@ -67,7 +67,7 @@ public class NumbersAdapter extends SimpleCursorAdapter { quickContactBadge.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE); } - ContactInfo info = mContactInfoHelper.lookupNumber(number, countryIso); + ContactInfo info = contactInfoHelper.lookupNumber(number, countryIso); if (info == null) { info = new ContactInfo(); info.number = number; @@ -75,7 +75,7 @@ public class NumbersAdapter extends SimpleCursorAdapter { final CharSequence locationOrType = getNumberTypeOrLocation(info, countryIso); final String displayNumber = getDisplayNumber(info); final String displayNumberStr = - mBidiFormatter.unicodeWrap(displayNumber, TextDirectionHeuristics.LTR); + bidiFormatter.unicodeWrap(displayNumber, TextDirectionHeuristics.LTR); String nameForDefaultImage; if (!TextUtils.isEmpty(info.name)) { @@ -99,15 +99,15 @@ public class NumbersAdapter extends SimpleCursorAdapter { final String lookupKey = info.lookupUri == null ? null : UriUtils.getLookupKeyFromUri(info.lookupUri); final int contactType = - mContactInfoHelper.isBusiness(info.sourceType) + contactInfoHelper.isBusiness(info.sourceType) ? LetterTileDrawable.TYPE_BUSINESS : LetterTileDrawable.TYPE_DEFAULT; final DefaultImageRequest request = new DefaultImageRequest(displayName, lookupKey, contactType, true /* isCircular */); badge.assignContactUri(info.lookupUri); badge.setContentDescription( - mContext.getResources().getString(R.string.description_contact_details, displayName)); - mContactPhotoManager.loadDirectoryPhoto( + context.getResources().getString(R.string.description_contact_details, displayName)); + contactPhotoManager.loadDirectoryPhoto( badge, info.photoUri, false /* darkTheme */, true /* isCircular */, request); } @@ -124,17 +124,17 @@ public class NumbersAdapter extends SimpleCursorAdapter { private CharSequence getNumberTypeOrLocation(ContactInfo info, String countryIso) { if (!TextUtils.isEmpty(info.name)) { return ContactsContract.CommonDataKinds.Phone.getTypeLabel( - mContext.getResources(), info.type, info.label); + context.getResources(), info.type, info.label); } else { - return PhoneNumberHelper.getGeoDescription(mContext, info.number, countryIso); + return PhoneNumberHelper.getGeoDescription(context, info.number, countryIso); } } protected Context getContext() { - return mContext; + return context; } protected FragmentManager getFragmentManager() { - return mFragmentManager; + return fragmentManager; } } diff --git a/java/com/android/dialer/app/filterednumber/ViewNumbersToImportFragment.java b/java/com/android/dialer/app/filterednumber/ViewNumbersToImportFragment.java index 1de768219..be3ae79f9 100644 --- a/java/com/android/dialer/app/filterednumber/ViewNumbersToImportFragment.java +++ b/java/com/android/dialer/app/filterednumber/ViewNumbersToImportFragment.java @@ -36,7 +36,7 @@ import com.android.dialer.blocking.FilteredNumbersUtil.ImportSendToVoicemailCont public class ViewNumbersToImportFragment extends ListFragment implements LoaderManager.LoaderCallbacks, View.OnClickListener { - private ViewNumbersToImportAdapter mAdapter; + private ViewNumbersToImportAdapter adapter; @Override public Context getContext() { @@ -47,12 +47,12 @@ public class ViewNumbersToImportFragment extends ListFragment public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - if (mAdapter == null) { - mAdapter = + if (adapter == null) { + adapter = ViewNumbersToImportAdapter.newViewNumbersToImportAdapter( getContext(), getActivity().getFragmentManager()); } - setListAdapter(mAdapter); + setListAdapter(adapter); } @Override @@ -103,12 +103,12 @@ public class ViewNumbersToImportFragment extends ListFragment @Override public void onLoadFinished(Loader loader, Cursor data) { - mAdapter.swapCursor(data); + adapter.swapCursor(data); } @Override public void onLoaderReset(Loader loader) { - mAdapter.swapCursor(null); + adapter.swapCursor(null); } @Override -- cgit v1.2.3