Merge "Remove field prefixes."

1 files changed, 18 insertions, 18 deletions

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;
   }
 }