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 --- .../dialer/blocking/BlockNumberDialogFragment.java | 72 ++++++++++----------- .../dialer/blocking/BlockReportSpamDialogs.java | 74 +++++++++++----------- .../dialer/blocking/FilteredNumberProvider.java | 26 ++++---- .../MigrateBlockedNumbersDialogFragment.java | 16 ++--- 4 files changed, 94 insertions(+), 94 deletions(-) (limited to 'java/com/android/dialer/blocking') diff --git a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java index 7ef77c4b6..f723a9cbe 100644 --- a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java +++ b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java @@ -49,13 +49,13 @@ public class BlockNumberDialogFragment extends DialogFragment { private static final String ARG_COUNTRY_ISO = "argCountryIso"; private static final String ARG_DISPLAY_NUMBER = "argDisplayNumber"; private static final String ARG_PARENT_VIEW_ID = "parentViewId"; - private String mNumber; - private String mDisplayNumber; - private String mCountryIso; - private FilteredNumberAsyncQueryHandler mHandler; - private View mParentView; - private VisualVoicemailEnabledChecker mVoicemailEnabledChecker; - private Callback mCallback; + private String number; + private String displayNumber; + private String countryIso; + private FilteredNumberAsyncQueryHandler handler; + private View parentView; + private VisualVoicemailEnabledChecker voicemailEnabledChecker; + private Callback callback; public static BlockNumberDialogFragment show( Integer blockId, @@ -97,7 +97,7 @@ public class BlockNumberDialogFragment extends DialogFragment { public void setFilteredNumberAsyncQueryHandlerForTesting( FilteredNumberAsyncQueryHandler handler) { - mHandler = handler; + this.handler = handler; } @Override @@ -110,19 +110,19 @@ public class BlockNumberDialogFragment extends DialogFragment { super.onCreateDialog(savedInstanceState); final boolean isBlocked = getArguments().containsKey(ARG_BLOCK_ID); - mNumber = getArguments().getString(ARG_NUMBER); - mDisplayNumber = getArguments().getString(ARG_DISPLAY_NUMBER); - mCountryIso = getArguments().getString(ARG_COUNTRY_ISO); + number = getArguments().getString(ARG_NUMBER); + displayNumber = getArguments().getString(ARG_DISPLAY_NUMBER); + countryIso = getArguments().getString(ARG_COUNTRY_ISO); - if (TextUtils.isEmpty(mDisplayNumber)) { - mDisplayNumber = mNumber; + if (TextUtils.isEmpty(displayNumber)) { + displayNumber = number; } - mHandler = new FilteredNumberAsyncQueryHandler(getContext()); - mVoicemailEnabledChecker = new VisualVoicemailEnabledChecker(getActivity(), null); + handler = new FilteredNumberAsyncQueryHandler(getContext()); + voicemailEnabledChecker = new VisualVoicemailEnabledChecker(getActivity(), null); // Choose not to update VoicemailEnabledChecker, as checks should already been done in // all current use cases. - mParentView = getActivity().findViewById(getArguments().getInt(ARG_PARENT_VIEW_ID)); + parentView = getActivity().findViewById(getArguments().getInt(ARG_PARENT_VIEW_ID)); CharSequence title; String okText; @@ -132,16 +132,16 @@ public class BlockNumberDialogFragment extends DialogFragment { okText = getString(R.string.unblock_number_ok); message = ContactDisplayUtils.getTtsSpannedPhoneNumber( - getResources(), R.string.unblock_number_confirmation_title, mDisplayNumber) + getResources(), R.string.unblock_number_confirmation_title, displayNumber) .toString(); } else { title = ContactDisplayUtils.getTtsSpannedPhoneNumber( - getResources(), R.string.block_number_confirmation_title, mDisplayNumber); + getResources(), R.string.block_number_confirmation_title, displayNumber); okText = getString(R.string.block_number_ok); if (FilteredNumberCompat.useNewFiltering(getContext())) { message = getString(R.string.block_number_confirmation_message_new_filtering); - } else if (mVoicemailEnabledChecker.isVisualVoicemailEnabled()) { + } else if (voicemailEnabledChecker.isVisualVoicemailEnabled()) { message = getString(R.string.block_number_confirmation_message_vvm); } else { message = getString(R.string.block_number_confirmation_message_no_vvm); @@ -171,13 +171,13 @@ public class BlockNumberDialogFragment extends DialogFragment { @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - String e164Number = PhoneNumberUtils.formatNumberToE164(mNumber, mCountryIso); - if (!FilteredNumbersUtil.canBlockNumber(getContext(), e164Number, mNumber)) { + String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso); + if (!FilteredNumbersUtil.canBlockNumber(getContext(), e164Number, number)) { dismiss(); Toast.makeText( getContext(), ContactDisplayUtils.getTtsSpannedPhoneNumber( - getResources(), R.string.invalidNumber, mDisplayNumber), + getResources(), R.string.invalidNumber, displayNumber), Toast.LENGTH_SHORT) .show(); } @@ -187,23 +187,23 @@ public class BlockNumberDialogFragment extends DialogFragment { public void onPause() { // Dismiss on rotation. dismiss(); - mCallback = null; + callback = null; super.onPause(); } public void setCallback(Callback callback) { - mCallback = callback; + this.callback = callback; } private CharSequence getBlockedMessage() { return ContactDisplayUtils.getTtsSpannedPhoneNumber( - getResources(), R.string.snackbar_number_blocked, mDisplayNumber); + getResources(), R.string.snackbar_number_blocked, displayNumber); } private CharSequence getUnblockedMessage() { return ContactDisplayUtils.getTtsSpannedPhoneNumber( - getResources(), R.string.snackbar_number_unblocked, mDisplayNumber); + getResources(), R.string.snackbar_number_unblocked, displayNumber); } private int getActionTextColor() { @@ -213,7 +213,7 @@ public class BlockNumberDialogFragment extends DialogFragment { private void blockNumber() { final CharSequence message = getBlockedMessage(); final CharSequence undoMessage = getUnblockedMessage(); - final Callback callback = mCallback; + final Callback callback = this.callback; final int actionTextColor = getActionTextColor(); final Context applicationContext = getContext().getApplicationContext(); @@ -221,7 +221,7 @@ public class BlockNumberDialogFragment extends DialogFragment { new OnUnblockNumberListener() { @Override public void onUnblockComplete(int rows, ContentValues values) { - Snackbar.make(mParentView, undoMessage, Snackbar.LENGTH_LONG).show(); + Snackbar.make(parentView, undoMessage, Snackbar.LENGTH_LONG).show(); if (callback != null) { callback.onChangeFilteredNumberUndo(); } @@ -239,11 +239,11 @@ public class BlockNumberDialogFragment extends DialogFragment { // Delete the newly created row on 'undo'. Logger.get(applicationContext) .logInteraction(InteractionEvent.Type.UNDO_BLOCK_NUMBER); - mHandler.unblock(onUndoListener, uri); + handler.unblock(onUndoListener, uri); } }; - Snackbar.make(mParentView, message, Snackbar.LENGTH_LONG) + Snackbar.make(parentView, message, Snackbar.LENGTH_LONG) .setAction(R.string.block_number_undo, undoListener) .setActionTextColor(actionTextColor) .show(); @@ -258,13 +258,13 @@ public class BlockNumberDialogFragment extends DialogFragment { } }; - mHandler.blockNumber(onBlockNumberListener, mNumber, mCountryIso); + handler.blockNumber(onBlockNumberListener, number, countryIso); } private void unblockNumber() { final CharSequence message = getUnblockedMessage(); final CharSequence undoMessage = getBlockedMessage(); - final Callback callback = mCallback; + final Callback callback = this.callback; final int actionTextColor = getActionTextColor(); final Context applicationContext = getContext().getApplicationContext(); @@ -272,14 +272,14 @@ public class BlockNumberDialogFragment extends DialogFragment { new OnBlockNumberListener() { @Override public void onBlockComplete(final Uri uri) { - Snackbar.make(mParentView, undoMessage, Snackbar.LENGTH_LONG).show(); + Snackbar.make(parentView, undoMessage, Snackbar.LENGTH_LONG).show(); if (callback != null) { callback.onChangeFilteredNumberUndo(); } } }; - mHandler.unblock( + handler.unblock( new OnUnblockNumberListener() { @Override public void onUnblockComplete(int rows, final ContentValues values) { @@ -290,11 +290,11 @@ public class BlockNumberDialogFragment extends DialogFragment { // Re-insert the row on 'undo', with a new ID. Logger.get(applicationContext) .logInteraction(InteractionEvent.Type.UNDO_UNBLOCK_NUMBER); - mHandler.blockNumber(onUndoListener, values); + handler.blockNumber(onUndoListener, values); } }; - Snackbar.make(mParentView, message, Snackbar.LENGTH_LONG) + Snackbar.make(parentView, message, Snackbar.LENGTH_LONG) .setAction(R.string.block_number_undo, undoListener) .setActionTextColor(actionTextColor) .show(); diff --git a/java/com/android/dialer/blocking/BlockReportSpamDialogs.java b/java/com/android/dialer/blocking/BlockReportSpamDialogs.java index b5f81fcc5..255d7cbf9 100644 --- a/java/com/android/dialer/blocking/BlockReportSpamDialogs.java +++ b/java/com/android/dialer/blocking/BlockReportSpamDialogs.java @@ -102,18 +102,18 @@ public class BlockReportSpamDialogs { private static class CommonDialogsFragment extends DialogFragment { /** The number to display in the dialog title. */ - protected String mDisplayNumber; + protected String displayNumber; /** Called when dialog positive button is pressed. */ - protected OnConfirmListener mPositiveListener; + protected OnConfirmListener positiveListener; /** Called when dialog is dismissed. */ - @Nullable protected DialogInterface.OnDismissListener mDismissListener; + @Nullable protected DialogInterface.OnDismissListener dismissListener; @Override public void onDismiss(DialogInterface dialog) { - if (mDismissListener != null) { - mDismissListener.onDismiss(dialog); + if (dismissListener != null) { + dismissListener.onDismiss(dialog); } super.onDismiss(dialog); } @@ -122,9 +122,9 @@ public class BlockReportSpamDialogs { public void onPause() { // The dialog is dismissed onPause, i.e. rotation. dismiss(); - mDismissListener = null; - mPositiveListener = null; - mDisplayNumber = null; + dismissListener = null; + positiveListener = null; + displayNumber = null; super.onPause(); } } @@ -133,10 +133,10 @@ public class BlockReportSpamDialogs { public static class BlockReportSpamDialogFragment extends CommonDialogsFragment { /** Called when dialog positive button is pressed. */ - private OnSpamDialogClickListener mPositiveListener; + private OnSpamDialogClickListener positiveListener; /** Whether the mark as spam checkbox is checked before displaying the dialog. */ - private boolean mSpamChecked; + private boolean spamChecked; public static DialogFragment newInstance( String displayNumber, @@ -144,10 +144,10 @@ public class BlockReportSpamDialogs { OnSpamDialogClickListener positiveListener, @Nullable DialogInterface.OnDismissListener dismissListener) { BlockReportSpamDialogFragment fragment = new BlockReportSpamDialogFragment(); - fragment.mSpamChecked = spamChecked; - fragment.mDisplayNumber = displayNumber; - fragment.mPositiveListener = positiveListener; - fragment.mDismissListener = dismissListener; + fragment.spamChecked = spamChecked; + fragment.displayNumber = displayNumber; + fragment.positiveListener = positiveListener; + fragment.dismissListener = dismissListener; return fragment; } @@ -158,12 +158,12 @@ public class BlockReportSpamDialogs { final CheckBox isSpamCheckbox = (CheckBox) dialogView.findViewById(R.id.report_number_as_spam_action); // Listen for changes on the checkbox and update if orientation changes - isSpamCheckbox.setChecked(mSpamChecked); + isSpamCheckbox.setChecked(spamChecked); isSpamCheckbox.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - mSpamChecked = isChecked; + spamChecked = isChecked; } }); @@ -174,14 +174,14 @@ public class BlockReportSpamDialogs { Dialog dialog = alertDialogBuilder .setView(dialogView) - .setTitle(getString(R.string.block_report_number_alert_title, mDisplayNumber)) + .setTitle(getString(R.string.block_report_number_alert_title, displayNumber)) .setPositiveButton( R.string.block_number_ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dismiss(); - mPositiveListener.onClick(isSpamCheckbox.isChecked()); + positiveListener.onClick(isSpamCheckbox.isChecked()); } }) .create(); @@ -201,9 +201,9 @@ public class BlockReportSpamDialogs { OnConfirmListener positiveListener, @Nullable DialogInterface.OnDismissListener dismissListener) { BlockDialogFragment fragment = new BlockDialogFragment(); - fragment.mDisplayNumber = displayNumber; - fragment.mPositiveListener = positiveListener; - fragment.mDismissListener = dismissListener; + fragment.displayNumber = displayNumber; + fragment.positiveListener = positiveListener; + fragment.dismissListener = dismissListener; fragment.isSpamEnabled = isSpamEnabled; return fragment; } @@ -215,14 +215,14 @@ public class BlockReportSpamDialogs { AlertDialog.Builder alertDialogBuilder = createDialogBuilder(getActivity(), this); Dialog dialog = alertDialogBuilder - .setTitle(getString(R.string.block_number_confirmation_title, mDisplayNumber)) + .setTitle(getString(R.string.block_number_confirmation_title, displayNumber)) .setMessage( isSpamEnabled ? getString( R.string.block_number_alert_details, getBlockMessage(getContext())) : getString(R.string.block_report_number_alert_details)) .setPositiveButton( - R.string.block_number_ok, createGenericOnClickListener(this, mPositiveListener)) + R.string.block_number_ok, createGenericOnClickListener(this, positiveListener)) .create(); dialog.setCanceledOnTouchOutside(true); return dialog; @@ -233,7 +233,7 @@ public class BlockReportSpamDialogs { public static class UnblockDialogFragment extends CommonDialogsFragment { /** Whether or not the number is spam. */ - private boolean mIsSpam; + private boolean isSpam; public static DialogFragment newInstance( String displayNumber, @@ -241,10 +241,10 @@ public class BlockReportSpamDialogs { OnConfirmListener positiveListener, @Nullable DialogInterface.OnDismissListener dismissListener) { UnblockDialogFragment fragment = new UnblockDialogFragment(); - fragment.mDisplayNumber = displayNumber; - fragment.mIsSpam = isSpam; - fragment.mPositiveListener = positiveListener; - fragment.mDismissListener = dismissListener; + fragment.displayNumber = displayNumber; + fragment.isSpam = isSpam; + fragment.positiveListener = positiveListener; + fragment.dismissListener = dismissListener; return fragment; } @@ -253,18 +253,18 @@ public class BlockReportSpamDialogs { super.onCreateDialog(savedInstanceState); // Return the newly created dialog AlertDialog.Builder alertDialogBuilder = createDialogBuilder(getActivity(), this); - if (mIsSpam) { + if (isSpam) { alertDialogBuilder .setMessage(R.string.unblock_number_alert_details) - .setTitle(getString(R.string.unblock_report_number_alert_title, mDisplayNumber)); + .setTitle(getString(R.string.unblock_report_number_alert_title, displayNumber)); } else { alertDialogBuilder.setMessage( - getString(R.string.unblock_report_number_alert_title, mDisplayNumber)); + getString(R.string.unblock_report_number_alert_title, displayNumber)); } Dialog dialog = alertDialogBuilder .setPositiveButton( - R.string.unblock_number_ok, createGenericOnClickListener(this, mPositiveListener)) + R.string.unblock_number_ok, createGenericOnClickListener(this, positiveListener)) .create(); dialog.setCanceledOnTouchOutside(true); return dialog; @@ -279,9 +279,9 @@ public class BlockReportSpamDialogs { OnConfirmListener positiveListener, @Nullable DialogInterface.OnDismissListener dismissListener) { ReportNotSpamDialogFragment fragment = new ReportNotSpamDialogFragment(); - fragment.mDisplayNumber = displayNumber; - fragment.mPositiveListener = positiveListener; - fragment.mDismissListener = dismissListener; + fragment.displayNumber = displayNumber; + fragment.positiveListener = positiveListener; + fragment.dismissListener = dismissListener; return fragment; } @@ -293,10 +293,10 @@ public class BlockReportSpamDialogs { Dialog dialog = alertDialogBuilder .setTitle(R.string.report_not_spam_alert_title) - .setMessage(getString(R.string.report_not_spam_alert_details, mDisplayNumber)) + .setMessage(getString(R.string.report_not_spam_alert_details, displayNumber)) .setPositiveButton( R.string.report_not_spam_alert_button, - createGenericOnClickListener(this, mPositiveListener)) + createGenericOnClickListener(this, positiveListener)) .create(); dialog.setCanceledOnTouchOutside(true); return dialog; diff --git a/java/com/android/dialer/blocking/FilteredNumberProvider.java b/java/com/android/dialer/blocking/FilteredNumberProvider.java index 8ed781e73..3fad4e24f 100644 --- a/java/com/android/dialer/blocking/FilteredNumberProvider.java +++ b/java/com/android/dialer/blocking/FilteredNumberProvider.java @@ -38,20 +38,20 @@ public class FilteredNumberProvider extends ContentProvider { private static final int FILTERED_NUMBERS_TABLE = 1; private static final int FILTERED_NUMBERS_TABLE_ID = 2; - private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH); - private DialerDatabaseHelper mDialerDatabaseHelper; + private static final UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH); + private DialerDatabaseHelper dialerDatabaseHelper; @Override public boolean onCreate() { - mDialerDatabaseHelper = Database.get(getContext()).getDatabaseHelper(getContext()); - if (mDialerDatabaseHelper == null) { + dialerDatabaseHelper = Database.get(getContext()).getDatabaseHelper(getContext()); + if (dialerDatabaseHelper == null) { return false; } - sUriMatcher.addURI( + uriMatcher.addURI( FilteredNumberContract.AUTHORITY, FilteredNumberContract.FilteredNumber.FILTERED_NUMBERS_TABLE, FILTERED_NUMBERS_TABLE); - sUriMatcher.addURI( + uriMatcher.addURI( FilteredNumberContract.AUTHORITY, FilteredNumberContract.FilteredNumber.FILTERED_NUMBERS_TABLE + "/#", FILTERED_NUMBERS_TABLE_ID); @@ -61,10 +61,10 @@ public class FilteredNumberProvider extends ContentProvider { @Override public Cursor query( Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { - final SQLiteDatabase db = mDialerDatabaseHelper.getReadableDatabase(); + final SQLiteDatabase db = dialerDatabaseHelper.getReadableDatabase(); SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); qb.setTables(DialerDatabaseHelper.Tables.FILTERED_NUMBER_TABLE); - final int match = sUriMatcher.match(uri); + final int match = uriMatcher.match(uri); switch (match) { case FILTERED_NUMBERS_TABLE: break; @@ -91,7 +91,7 @@ public class FilteredNumberProvider extends ContentProvider { @Override public Uri insert(Uri uri, ContentValues values) { - SQLiteDatabase db = mDialerDatabaseHelper.getWritableDatabase(); + SQLiteDatabase db = dialerDatabaseHelper.getWritableDatabase(); setDefaultValues(values); long id = db.insert(DialerDatabaseHelper.Tables.FILTERED_NUMBER_TABLE, null, values); if (id < 0) { @@ -120,8 +120,8 @@ public class FilteredNumberProvider extends ContentProvider { @Override public int delete(Uri uri, String selection, String[] selectionArgs) { - SQLiteDatabase db = mDialerDatabaseHelper.getWritableDatabase(); - final int match = sUriMatcher.match(uri); + SQLiteDatabase db = dialerDatabaseHelper.getWritableDatabase(); + final int match = uriMatcher.match(uri); switch (match) { case FILTERED_NUMBERS_TABLE: break; @@ -141,8 +141,8 @@ public class FilteredNumberProvider extends ContentProvider { @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { - SQLiteDatabase db = mDialerDatabaseHelper.getWritableDatabase(); - final int match = sUriMatcher.match(uri); + SQLiteDatabase db = dialerDatabaseHelper.getWritableDatabase(); + final int match = uriMatcher.match(uri); switch (match) { case FILTERED_NUMBERS_TABLE: break; diff --git a/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java b/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java index 76e50b38e..9b416ff5e 100644 --- a/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java +++ b/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java @@ -32,8 +32,8 @@ import java.util.Objects; */ public class MigrateBlockedNumbersDialogFragment extends DialogFragment { - private BlockedNumbersMigrator mBlockedNumbersMigrator; - private BlockedNumbersMigrator.Listener mMigrationListener; + private BlockedNumbersMigrator blockedNumbersMigrator; + private BlockedNumbersMigrator.Listener migrationListener; /** * Creates a new MigrateBlockedNumbersDialogFragment. @@ -49,8 +49,8 @@ public class MigrateBlockedNumbersDialogFragment extends DialogFragment { BlockedNumbersMigrator blockedNumbersMigrator, BlockedNumbersMigrator.Listener migrationListener) { MigrateBlockedNumbersDialogFragment fragment = new MigrateBlockedNumbersDialogFragment(); - fragment.mBlockedNumbersMigrator = Objects.requireNonNull(blockedNumbersMigrator); - fragment.mMigrationListener = Objects.requireNonNull(migrationListener); + fragment.blockedNumbersMigrator = Objects.requireNonNull(blockedNumbersMigrator); + fragment.migrationListener = Objects.requireNonNull(migrationListener); return fragment; } @@ -90,12 +90,12 @@ public class MigrateBlockedNumbersDialogFragment extends DialogFragment { public void onClick(View v) { alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false); - mBlockedNumbersMigrator.migrate( + blockedNumbersMigrator.migrate( new Listener() { @Override public void onComplete() { alertDialog.dismiss(); - mMigrationListener.onComplete(); + migrationListener.onComplete(); } }); } @@ -106,8 +106,8 @@ public class MigrateBlockedNumbersDialogFragment extends DialogFragment { public void onPause() { // The dialog is dismissed and state is cleaned up onPause, i.e. rotation. dismiss(); - mBlockedNumbersMigrator = null; - mMigrationListener = null; + blockedNumbersMigrator = null; + migrationListener = null; super.onPause(); } } -- cgit v1.2.3