Remove field prefixes from bottom nav code in the widget package.

This is part 2 of a change that removes field prefixes from code related to bottom nav.

PiperOrigin-RevId: 181229750

Author: afohrman

lib/java/android/support/design/widget/BottomNavigationView.java

@@ -101,14 +101,13 @@ public class BottomNavigationView extends FrameLayout {
 
   private static final int MENU_PRESENTER_ID = 1;
 
-  private final MenuBuilder mMenu;
-  private final BottomNavigationMenuView mMenuView;
-  private final BottomNavigationPresenter mPresenter = new BottomNavigationPresenter();
-  private MenuInflater mMenuInflater;
-
-  private OnNavigationItemSelectedListener mSelectedListener;
-  private OnNavigationItemReselectedListener mReselectedListener;
+  private final MenuBuilder menu;
+  private final BottomNavigationMenuView menuView;
+  private final BottomNavigationPresenter presenter = new BottomNavigationPresenter();
+  private MenuInflater menuInflater;
 
+  private OnNavigationItemSelectedListener selectedListener;
+  private OnNavigationItemReselectedListener reselectedListener;
 
   public BottomNavigationView(Context context) {
     this(context, null);
@@ -124,20 +123,20 @@ public BottomNavigationView(Context context, AttributeSet attrs, int defStyleAtt
     ThemeEnforcement.checkAppCompatTheme(context);
 
     // Create the menu
-    mMenu = new BottomNavigationMenu(context);
+    this.menu = new BottomNavigationMenu(context);
 
-    mMenuView = new BottomNavigationMenuView(context);
+    menuView = new BottomNavigationMenuView(context);
     FrameLayout.LayoutParams params =
         new FrameLayout.LayoutParams(
             ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
     params.gravity = Gravity.CENTER;
-    mMenuView.setLayoutParams(params);
+    menuView.setLayoutParams(params);
 
-    mPresenter.setBottomNavigationMenuView(mMenuView);
-    mPresenter.setId(MENU_PRESENTER_ID);
-    mMenuView.setPresenter(mPresenter);
-    mMenu.addMenuPresenter(mPresenter);
-    mPresenter.initForMenu(getContext(), mMenu);
+    presenter.setBottomNavigationMenuView(menuView);
+    presenter.setId(MENU_PRESENTER_ID);
+    menuView.setPresenter(presenter);
+    this.menu.addMenuPresenter(presenter);
+    presenter.initForMenu(getContext(), this.menu);
 
     // Custom attributes
     TintTypedArray a =
@@ -149,15 +148,15 @@ public BottomNavigationView(Context context, AttributeSet attrs, int defStyleAtt
             R.style.Widget_Design_BottomNavigationView);
 
     if (a.hasValue(R.styleable.BottomNavigationView_itemIconTint)) {
-      mMenuView.setIconTintList(a.getColorStateList(R.styleable.BottomNavigationView_itemIconTint));
+      menuView.setIconTintList(a.getColorStateList(R.styleable.BottomNavigationView_itemIconTint));
     } else {
-      mMenuView.setIconTintList(createDefaultColorStateList(android.R.attr.textColorSecondary));
+      menuView.setIconTintList(createDefaultColorStateList(android.R.attr.textColorSecondary));
     }
     if (a.hasValue(R.styleable.BottomNavigationView_itemTextColor)) {
-      mMenuView.setItemTextColor(
+      menuView.setItemTextColor(
           a.getColorStateList(R.styleable.BottomNavigationView_itemTextColor));
     } else {
-      mMenuView.setItemTextColor(createDefaultColorStateList(android.R.attr.textColorSecondary));
+      menuView.setItemTextColor(createDefaultColorStateList(android.R.attr.textColorSecondary));
     }
     if (a.hasValue(R.styleable.BottomNavigationView_elevation)) {
       ViewCompat.setElevation(
@@ -167,7 +166,7 @@ public BottomNavigationView(Context context, AttributeSet attrs, int defStyleAtt
       @ShiftingMode
       int shiftingMode =
           a.getInt(R.styleable.BottomNavigationView_shiftingMode, ShiftingMode.SHIFTING_MODE_AUTO);
-      mMenuView.setShiftingMode(shiftingMode);
+      menuView.setShiftingMode(shiftingMode);
     }
 
     setLabelVisibilityMode(
@@ -178,27 +177,27 @@ public BottomNavigationView(Context context, AttributeSet attrs, int defStyleAtt
         a.getBoolean(R.styleable.BottomNavigationView_itemHorizontalTranslation, true));
 
     int itemBackground = a.getResourceId(R.styleable.BottomNavigationView_itemBackground, 0);
-    mMenuView.setItemBackgroundRes(itemBackground);
+    menuView.setItemBackgroundRes(itemBackground);
 
     if (a.hasValue(R.styleable.BottomNavigationView_menu)) {
       inflateMenu(a.getResourceId(R.styleable.BottomNavigationView_menu, 0));
     }
     a.recycle();
 
-    addView(mMenuView, params);
+    addView(menuView, params);
     if (Build.VERSION.SDK_INT < 21) {
       addCompatibilityTopDivider(context);
     }
 
-    mMenu.setCallback(
+    this.menu.setCallback(
         new MenuBuilder.Callback() {
           @Override
           public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
-            if (mReselectedListener != null && item.getItemId() == getSelectedItemId()) {
-              mReselectedListener.onNavigationItemReselected(item);
+            if (reselectedListener != null && item.getItemId() == getSelectedItemId()) {
+              reselectedListener.onNavigationItemReselected(item);
               return true; // item is already selected
             }
-            return mSelectedListener != null && !mSelectedListener.onNavigationItemSelected(item);
+            return selectedListener != null && !selectedListener.onNavigationItemSelected(item);
           }
 
           @Override
@@ -216,7 +215,7 @@ public void onMenuModeChange(MenuBuilder menu) {}
    */
   public void setOnNavigationItemSelectedListener(
       @Nullable OnNavigationItemSelectedListener listener) {
-    mSelectedListener = listener;
+    selectedListener = listener;
   }
 
   /**
@@ -228,13 +227,13 @@ public void setOnNavigationItemSelectedListener(
    */
   public void setOnNavigationItemReselectedListener(
       @Nullable OnNavigationItemReselectedListener listener) {
-    mReselectedListener = listener;
+    reselectedListener = listener;
   }
 
   /** Returns the {@link Menu} instance associated with this bottom navigation bar. */
   @NonNull
   public Menu getMenu() {
-    return mMenu;
+    return menu;
   }
 
   /**
@@ -245,10 +244,10 @@ public Menu getMenu() {
    * @param resId ID of a menu resource to inflate
    */
   public void inflateMenu(int resId) {
-    mPresenter.setUpdateSuspended(true);
-    getMenuInflater().inflate(resId, mMenu);
-    mPresenter.setUpdateSuspended(false);
-    mPresenter.updateMenuView(true);
+    presenter.setUpdateSuspended(true);
+    getMenuInflater().inflate(resId, menu);
+    presenter.setUpdateSuspended(false);
+    presenter.updateMenuView(true);
   }
 
   /** @return The maximum number of items that can be shown in BottomNavigationView. */
@@ -264,7 +263,7 @@ public int getMaxItemCount() {
    */
   @Nullable
   public ColorStateList getItemIconTintList() {
-    return mMenuView.getIconTintList();
+    return menuView.getIconTintList();
   }
 
   /**
@@ -274,7 +273,7 @@ public ColorStateList getItemIconTintList() {
    * @attr ref R.styleable#BottomNavigationView_itemIconTint
    */
   public void setItemIconTintList(@Nullable ColorStateList tint) {
-    mMenuView.setIconTintList(tint);
+    menuView.setIconTintList(tint);
   }
 
   /**
@@ -287,7 +286,7 @@ public void setItemIconTintList(@Nullable ColorStateList tint) {
    */
   @Nullable
   public ColorStateList getItemTextColor() {
-    return mMenuView.getItemTextColor();
+    return menuView.getItemTextColor();
   }
 
   /**
@@ -298,7 +297,7 @@ public ColorStateList getItemTextColor() {
    * @attr ref R.styleable#BottomNavigationView_itemTextColor
    */
   public void setItemTextColor(@Nullable ColorStateList textColor) {
-    mMenuView.setItemTextColor(textColor);
+    menuView.setItemTextColor(textColor);
   }
 
   /**
@@ -309,7 +308,7 @@ public void setItemTextColor(@Nullable ColorStateList textColor) {
    */
   @DrawableRes
   public int getItemBackgroundResource() {
-    return mMenuView.getItemBackgroundRes();
+    return menuView.getItemBackgroundRes();
   }
 
   /**
@@ -319,7 +318,7 @@ public int getItemBackgroundResource() {
    * @attr ref R.styleable#BottomNavigationView_itemBackground
    */
   public void setItemBackgroundResource(@DrawableRes int resId) {
-    mMenuView.setItemBackgroundRes(resId);
+    menuView.setItemBackgroundRes(resId);
   }
 
   /**
@@ -329,7 +328,7 @@ public void setItemBackgroundResource(@DrawableRes int resId) {
    */
   @IdRes
   public int getSelectedItemId() {
-    return mMenuView.getSelectedItemId();
+    return menuView.getSelectedItemId();
   }
 
   /**
@@ -339,9 +338,9 @@ public int getSelectedItemId() {
    * @see #getSelectedItemId()
    */
   public void setSelectedItemId(@IdRes int itemId) {
-    MenuItem item = mMenu.findItem(itemId);
+    MenuItem item = menu.findItem(itemId);
     if (item != null) {
-      if (!mMenu.performItemAction(item, mPresenter, 0)) {
+      if (!menu.performItemAction(item, presenter, 0)) {
         item.setChecked(true);
       }
     }
@@ -357,7 +356,7 @@ public void setSelectedItemId(@IdRes int itemId) {
   @Deprecated
   @ShiftingMode
   public int getShiftingMode() {
-    return mMenuView.getShiftingMode();
+    return menuView.getShiftingMode();
   }
 
   /**
@@ -380,9 +379,9 @@ public int getShiftingMode() {
    */
   @Deprecated
   public void setShiftingMode(@ShiftingMode int shiftingMode) {
-    if (mMenuView.getShiftingMode() != shiftingMode) {
-      mMenuView.setShiftingMode(shiftingMode);
-      mPresenter.updateMenuView(false /* cleared */);
+    if (menuView.getShiftingMode() != shiftingMode) {
+      menuView.setShiftingMode(shiftingMode);
+      presenter.updateMenuView(false /* cleared */);
     }
   }
 
@@ -401,9 +400,9 @@ public void setShiftingMode(@ShiftingMode int shiftingMode) {
    * @see #getLabelVisibilityMode()
    */
   public void setLabelVisibilityMode(@LabelVisibilityMode int labelVisibilityMode) {
-    if (mMenuView.getLabelVisibilityMode() != labelVisibilityMode) {
-      mMenuView.setLabelVisibilityMode(labelVisibilityMode);
-      mPresenter.updateMenuView(false);
+    if (menuView.getLabelVisibilityMode() != labelVisibilityMode) {
+      menuView.setLabelVisibilityMode(labelVisibilityMode);
+      presenter.updateMenuView(false);
     }
   }
 
@@ -433,7 +432,7 @@ public void setLabelVisibilityModeResource(@IntegerRes int labelVisibilityModeId
    */
   @LabelVisibilityMode
   public int getLabelVisibilityMode() {
-    return mMenuView.getLabelVisibilityMode();
+    return menuView.getLabelVisibilityMode();
   }
 
   /**
@@ -443,9 +442,9 @@ public int getLabelVisibilityMode() {
    * @see #getItemHorizontalTranslation()
    */
   public void setItemHorizontalTranslation(boolean itemHorizontalTranslation) {
-    if (mMenuView.getItemHorizontalTranslation() != itemHorizontalTranslation) {
-      mMenuView.setItemHorizontalTranslation(itemHorizontalTranslation);
-      mPresenter.updateMenuView(false);
+    if (menuView.getItemHorizontalTranslation() != itemHorizontalTranslation) {
+      menuView.setItemHorizontalTranslation(itemHorizontalTranslation);
+      presenter.updateMenuView(false);
     }
   }
 
@@ -466,7 +465,7 @@ public void setItemHorizontalTranslation(@BoolRes int itemHorizontalTranslation)
    * @see #setItemHorizontalTranslation(boolean)
    */
   public boolean getItemHorizontalTranslation() {
-    return mMenuView.getItemHorizontalTranslation();
+    return menuView.getItemHorizontalTranslation();
   }
 
   /** Listener for handling selection events on bottom navigation items. */
@@ -507,10 +506,10 @@ private void addCompatibilityTopDivider(Context context) {
   }
 
   private MenuInflater getMenuInflater() {
-    if (mMenuInflater == null) {
-      mMenuInflater = new SupportMenuInflater(getContext());
+    if (menuInflater == null) {
+      menuInflater = new SupportMenuInflater(getContext());
     }
-    return mMenuInflater;
+    return menuInflater;
   }
 
   private ColorStateList createDefaultColorStateList(int baseColorThemeAttr) {
@@ -538,7 +537,7 @@ protected Parcelable onSaveInstanceState() {
     Parcelable superState = super.onSaveInstanceState();
     SavedState savedState = new SavedState(superState);
     savedState.menuPresenterState = new Bundle();
-    mMenu.savePresenterStates(savedState.menuPresenterState);
+    menu.savePresenterStates(savedState.menuPresenterState);
     return savedState;
   }
 
@@ -550,7 +549,7 @@ protected void onRestoreInstanceState(Parcelable state) {
     }
     SavedState savedState = (SavedState) state;
     super.onRestoreInstanceState(savedState.getSuperState());
-    mMenu.restorePresenterStates(savedState.menuPresenterState);
+    menu.restorePresenterStates(savedState.menuPresenterState);
   }
 
   static class SavedState extends AbsSavedState {