[NavigationRail] Add an attribute to control how we measure the bottom padding of the navigation item

PiperOrigin-RevId: 640992331

Author: imhappi

lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml

@@ -31,6 +31,7 @@
     <item name="itemActiveIndicatorStyle">@null</item>
     <item name="android:minHeight">@dimen/design_bottom_navigation_height</item>
     <item name="itemIconGravity">top</item>
+    <item name="measureBottomPaddingFromLabelBaseline">false</item>
   </style>
 
   <!-- Default style for BottomNavigationViews.

lib/java/com/google/android/material/navigation/NavigationBarItemView.java

@@ -673,6 +673,8 @@ public void setIconSize(int iconSize) {
   // TODO(b/338647654): We can remove this once navigation rail is updated
   public void setMeasureBottomPaddingFromLabelBaseline(boolean measurePaddingFromBaseline) {
     labelGroup.setMeasurePaddingFromBaseline(measurePaddingFromBaseline);
+    smallLabel.setIncludeFontPadding(measurePaddingFromBaseline);
+    largeLabel.setIncludeFontPadding(measurePaddingFromBaseline);
     requestLayout();
   }
 

lib/java/com/google/android/material/navigation/NavigationBarMenuView.java

@@ -110,6 +110,7 @@ public abstract class NavigationBarMenuView extends ViewGroup implements MenuVie
 
   private NavigationBarPresenter presenter;
   private MenuBuilder menu;
+  private boolean measurePaddingFromLabelBaseline;
 
   public NavigationBarMenuView(@NonNull Context context) {
     super(context);
@@ -369,6 +370,15 @@ public void setItemPaddingBottom(@Px int paddingBottom) {
     }
   }
 
+  public void setMeasurePaddingFromLabelBaseline(boolean measurePaddingFromLabelBaseline) {
+    this.measurePaddingFromLabelBaseline = measurePaddingFromLabelBaseline;
+    if (buttons != null) {
+      for (NavigationBarItemView item : buttons) {
+        item.setMeasureBottomPaddingFromLabelBaseline(measurePaddingFromLabelBaseline);
+      }
+    }
+  }
+
   /**
    * Get the distance between the item's active indicator container and the label.
    */
@@ -778,6 +788,7 @@ public void buildMenuView() {
       if (itemPaddingBottom != NO_PADDING) {
         child.setItemPaddingBottom(itemPaddingBottom);
       }
+      child.setMeasureBottomPaddingFromLabelBaseline(measurePaddingFromLabelBaseline);
       if (itemActiveIndicatorLabelPadding != NO_PADDING) {
         child.setActiveIndicatorLabelPadding(itemActiveIndicatorLabelPadding);
       }

lib/java/com/google/android/material/navigation/NavigationBarView.java

@@ -278,6 +278,9 @@ public NavigationBarView(
               context, attributes, R.styleable.NavigationBarView_itemRippleColor));
     }
 
+    setMeasureBottomPaddingFromLabelBaseline(attributes.getBoolean(
+        R.styleable.NavigationBarView_measureBottomPaddingFromLabelBaseline, true));
+
     int activeIndicatorStyleResId =
         attributes.getResourceId(R.styleable.NavigationBarView_itemActiveIndicatorStyle, 0);
 
@@ -605,6 +608,10 @@ public void setItemPaddingBottom(@Px int paddingBottom) {
     menuView.setItemPaddingBottom(paddingBottom);
   }
 
+  private void setMeasureBottomPaddingFromLabelBaseline(boolean measurePaddingFromBaseline) {
+    menuView.setMeasurePaddingFromLabelBaseline(measurePaddingFromBaseline);
+  }
+
   /**
    * Set the distance between the active indicator container and the item's label.
    */

lib/java/com/google/android/material/navigation/res/values/attrs.xml

@@ -87,6 +87,10 @@
       <enum name="top" value="0"/>
       <enum name="start" value="1"/>
     </attr>
+
+    <!-- Measure the item's bottom padding from the baseline of the label, not the bottom of its
+         view. -->
+    <attr name="measureBottomPaddingFromLabelBaseline" format="boolean"/>
   </declare-styleable>
 
   <declare-styleable name="NavigationBarActiveIndicator">

lib/java/com/google/android/material/navigationrail/NavigationRailItemView.java

@@ -33,8 +33,6 @@
 final class NavigationRailItemView extends NavigationBarItemView {
   public NavigationRailItemView(@NonNull Context context) {
     super(context);
-    // TODO(b/338647654): Measure Navigation Rail from the bottom of the textview, not baseline
-    setMeasureBottomPaddingFromLabelBaseline(true);
   }
 
   @Override

lib/java/com/google/android/material/navigationrail/res/values/styles.xml

@@ -42,6 +42,7 @@
     <item name="contentMarginTop">@dimen/mtrl_navigation_rail_margin</item>
     <item name="headerMarginBottom">@dimen/mtrl_navigation_rail_margin</item>
     <item name="itemIconGravity">top</item>
+    <item name="measureBottomPaddingFromLabelBaseline">true</item>
   </style>
 
   <style name="Widget.MaterialComponents.NavigationRailView.Compact">