[OverflowLinearLayout] Use button's text or content description as default menu item text.

PiperOrigin-RevId: 764857390

Author: leticiarossi

lib/java/com/google/android/material/button/MaterialButtonGroup.java

@@ -31,6 +31,7 @@
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import androidx.appcompat.widget.PopupMenu;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
@@ -482,12 +483,7 @@ private MenuItem addMenuItemForButton(@NonNull Menu menu, @NonNull Button button
     }
     MaterialButtonGroup.LayoutParams lp =
         (MaterialButtonGroup.LayoutParams) button.getLayoutParams();
-    String text = lp.overflowText;
-    // Use button's text if overflow text is not specified or empty. We don't do this to icon, since
-    // icon in menu item is optional.
-    if (text == null || text.isEmpty()) {
-      text = (String) button.getText();
-    }
+    String text = OverflowUtils.getMenuItemText(button, lp.overflowText);
     Drawable icon = lp.overflowIcon;
     MenuItem item = menu.add(text);
     if (icon != null) {
@@ -1201,4 +1197,29 @@ public LayoutParams(@NonNull MaterialButtonGroup.LayoutParams source) {
       this.overflowIcon = source.overflowIcon;
     }
   }
+
+  /**
+   * Class for common logic between this MaterialButtonGroup and the OverflowLinearLayout
+   * overflow features.
+   *
+   * @hide
+   */
+  @RestrictTo(LIBRARY_GROUP)
+  public static class OverflowUtils {
+    private OverflowUtils() {}
+
+    @Nullable
+    public static String getMenuItemText(@NonNull View view, @Nullable String text) {
+      if (!TextUtils.isEmpty(text)) {
+        return text;
+      }
+      if (view instanceof MaterialButton && !TextUtils.isEmpty(((MaterialButton) view).getText())) {
+        // Use button's text if overflow text is not specified or empty. We don't do this to icon,
+        // since icon in menu item is optional.
+        return (String) ((MaterialButton) view).getText();
+      }
+      // As a last resort, use content description.
+      return (String) view.getContentDescription();
+    }
+  }
 }

lib/java/com/google/android/material/overflow/OverflowLinearLayout.java

@@ -39,6 +39,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.button.MaterialButton;
+import com.google.android.material.button.MaterialButtonGroup.OverflowUtils;
 import com.google.android.material.internal.ThemeEnforcement;
 import com.google.android.material.resources.MaterialAttributes;
 import java.util.LinkedHashSet;
@@ -262,7 +263,9 @@ private void handleOverflowButtonClick(PopupMenu popupMenu, int overflowItemIcon
     for (View view : overflowViews) {
       OverflowLinearLayout.LayoutParams lp =
           (OverflowLinearLayout.LayoutParams) view.getLayoutParams();
-      MenuItem item = popupMenu.getMenu().add(lp.overflowText);
+
+      String text = OverflowUtils.getMenuItemText(view, lp.overflowText);
+      MenuItem item = popupMenu.getMenu().add(text);
       Drawable icon = lp.overflowIcon;
       if (icon != null) {
         item.setIcon(
@@ -272,8 +275,8 @@ private void handleOverflowButtonClick(PopupMenu popupMenu, int overflowItemIcon
         MaterialButton button = (MaterialButton) view;
         item.setCheckable(button.isCheckable());
         item.setChecked(button.isChecked());
-        item.setEnabled(button.isEnabled());
       }
+      item.setEnabled(view.isEnabled());
       item.setOnMenuItemClickListener(
           menuItem -> {
             view.performClick();