[OverflowLinearLayout][Button] Overflow menu item's text should be CharSequence

PiperOrigin-RevId: 764904265

Author: leticiarossi

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

@@ -483,7 +483,7 @@ private MenuItem addMenuItemForButton(@NonNull Menu menu, @NonNull Button button
     }
     MaterialButtonGroup.LayoutParams lp =
         (MaterialButtonGroup.LayoutParams) button.getLayoutParams();
-    String text = OverflowUtils.getMenuItemText(button, lp.overflowText);
+    CharSequence text = OverflowUtils.getMenuItemText(button, lp.overflowText);
     Drawable icon = lp.overflowIcon;
     MenuItem item = menu.add(text);
     if (icon != null) {
@@ -1121,7 +1121,7 @@ protected boolean checkLayoutParams(@NonNull ViewGroup.LayoutParams p) {
   /** A {@link LinearLayout.LayoutParams} implementation for {@link MaterialButtonGroup}. */
   public static class LayoutParams extends LinearLayout.LayoutParams {
     @Nullable public Drawable overflowIcon = null;
-    @Nullable public String overflowText = null;
+    @Nullable public CharSequence overflowText = null;
 
     /**
      * Creates a new set of layout parameters. The values are extracted from the supplied attributes
@@ -1138,7 +1138,7 @@ public LayoutParams(@NonNull Context context, @Nullable AttributeSet attrs) {
       overflowIcon =
           attributes.getDrawable(R.styleable.MaterialButtonGroup_Layout_layout_overflowIcon);
       overflowText =
-          attributes.getString(R.styleable.MaterialButtonGroup_Layout_layout_overflowText);
+          attributes.getText(R.styleable.MaterialButtonGroup_Layout_layout_overflowText);
 
       attributes.recycle();
     }
@@ -1161,14 +1161,14 @@ public LayoutParams(int width, int height, float weight) {
      *     in pixels
      * @param weight the weight
      * @param overflowIcon the overflow icon drawable
-     * @param overflowText the overflow text string
+     * @param overflowText the overflow text char sequence
      */
     public LayoutParams(
         int width,
         int height,
         float weight,
         @Nullable Drawable overflowIcon,
-        @Nullable String overflowText) {
+        @Nullable CharSequence overflowText) {
       super(width, height, weight);
       this.overflowIcon = overflowIcon;
       this.overflowText = overflowText;
@@ -1209,17 +1209,17 @@ public static class OverflowUtils {
     private OverflowUtils() {}
 
     @Nullable
-    public static String getMenuItemText(@NonNull View view, @Nullable String text) {
+    public static CharSequence getMenuItemText(@NonNull View view, @Nullable CharSequence 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();
+        return ((MaterialButton) view).getText();
       }
       // As a last resort, use content description.
-      return (String) view.getContentDescription();
+      return view.getContentDescription();
     }
   }
 }

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

@@ -264,7 +264,7 @@ private void handleOverflowButtonClick(PopupMenu popupMenu, int overflowItemIcon
       OverflowLinearLayout.LayoutParams lp =
           (OverflowLinearLayout.LayoutParams) view.getLayoutParams();
 
-      String text = OverflowUtils.getMenuItemText(view, lp.overflowText);
+      CharSequence text = OverflowUtils.getMenuItemText(view, lp.overflowText);
       MenuItem item = popupMenu.getMenu().add(text);
       Drawable icon = lp.overflowIcon;
       if (icon != null) {
@@ -330,7 +330,7 @@ protected boolean checkLayoutParams(@NonNull ViewGroup.LayoutParams p) {
   /** A {@link LinearLayout.LayoutParams} implementation for {@link OverflowLinearLayout}. */
   public static class LayoutParams extends LinearLayout.LayoutParams {
     @Nullable public Drawable overflowIcon = null;
-    @Nullable public String overflowText = null;
+    @Nullable public CharSequence overflowText = null;
 
     /**
      * Creates a new set of layout parameters. The values are extracted from the supplied attributes
@@ -347,7 +347,7 @@ public LayoutParams(@NonNull Context context, @Nullable AttributeSet attrs) {
       overflowIcon =
           attributes.getDrawable(R.styleable.OverflowLinearLayout_Layout_layout_overflowIcon);
       overflowText =
-          attributes.getString(R.styleable.OverflowLinearLayout_Layout_layout_overflowText);
+          attributes.getText(R.styleable.OverflowLinearLayout_Layout_layout_overflowText);
 
       attributes.recycle();
     }
@@ -370,14 +370,14 @@ public LayoutParams(int width, int height, float weight) {
      *     in pixels
      * @param weight the weight
      * @param overflowIcon the overflow icon drawable
-     * @param overflowText the overflow text string
+     * @param overflowText the overflow text char sequence
      */
     public LayoutParams(
         int width,
         int height,
         float weight,
         @Nullable Drawable overflowIcon,
-        @Nullable String overflowText) {
+        @Nullable CharSequence overflowText) {
       super(width, height, weight);
       this.overflowIcon = overflowIcon;
       this.overflowText = overflowText;