[Buttons] Use Layout to measure text width.

This corrects icon placement when used with Spanned text.

PiperOrigin-RevId: 483047554

Author: Material Design Team

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

@@ -20,6 +20,7 @@
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 import static com.google.android.material.theme.overlay.MaterialThemeOverlay.wrap;
+import static java.lang.Math.ceil;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 
@@ -613,24 +614,12 @@ private void updateIconPosition(int buttonWidth, int buttonHeight) {
   }
 
   private int getTextLayoutWidth() {
-    int maxWidth = 0;
+    float maxWidth = 0;
     int lineCount = getLineCount();
     for (int line = 0; line < lineCount; line++) {
-      maxWidth = max(maxWidth, getTextWidth(getTextInLine(line)));
+      maxWidth = max(maxWidth, getLayout().getLineWidth(line));
     }
-    return maxWidth;
-  }
-
-  private int getTextWidth(CharSequence text) {
-    Paint textPaint = getPaint();
-    String buttonText = text.toString();
-    if (getTransformationMethod() != null) {
-      // if text is transformed, add that transformation to to ensure correct calculation
-      // of icon padding.
-      buttonText = getTransformationMethod().getTransformation(buttonText, this).toString();
-    }
-
-    return min((int) textPaint.measureText(buttonText), getLayout().getEllipsizedWidth());
+    return (int) ceil(maxWidth);
   }
 
   private int getTextHeight() {
@@ -652,12 +641,6 @@ private int getTextHeight() {
     return min(bounds.height(), getLayout().getHeight());
   }
 
-  private CharSequence getTextInLine(int line) {
-    int start = getLayout().getLineStart(line);
-    int end = getLayout().getLineEnd(line);
-    return getText().subSequence(start, end);
-  }
-
   private boolean isLayoutRTL() {
     return ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL;
   }