[TextInputLayout] Adjusted background of collapsed hint to not overlap with edit text's background.

Resolves #1660
Resolves #1319

PiperOrigin-RevId: 353645196

Author: leticiarossi

lib/java/com/google/android/material/textfield/TextInputLayout.java

@@ -231,6 +231,7 @@ public class TextInputLayout extends LinearLayout {
   @NonNull private ShapeAppearanceModel shapeAppearanceModel;
 
   private final int boxLabelCutoutPaddingPx;
+  private int boxLabelCutoutWidth;
   @BoxBackgroundMode private int boxBackgroundMode;
   private int boxCollapsedPaddingTopPx;
   private int boxStrokeWidthPx;
@@ -3980,13 +3981,23 @@ private void openCutout() {
     final RectF cutoutBounds = tmpRectF;
     collapsingTextHelper.getCollapsedTextActualBounds(
         cutoutBounds, editText.getWidth(), editText.getGravity());
+    boxLabelCutoutWidth = boxStrokeWidthPx;
+    cutoutBounds.bottom = cutoutBounds.top + boxLabelCutoutWidth;
     applyCutoutPadding(cutoutBounds);
     // Offset the cutout bounds by the TextInputLayout's left and top paddings to ensure that the
     // cutout is inset relative to the TextInputLayout's bounds.
     cutoutBounds.offset(-getPaddingLeft(), -getPaddingTop());
     ((CutoutDrawable) boxBackground).setCutout(cutoutBounds);
   }
 
+  /** If stroke changed width, cutout bounds need to be recalculated.  **/
+  private void updateCutout() {
+    if (cutoutEnabled() && !hintExpanded && boxLabelCutoutWidth != boxStrokeWidthPx) {
+      closeCutout();
+      openCutout();
+    }
+  }
+
   private void closeCutout() {
     if (cutoutEnabled()) {
       ((CutoutDrawable) boxBackground).removeCutout();
@@ -3995,9 +4006,7 @@ private void closeCutout() {
 
   private void applyCutoutPadding(@NonNull RectF cutoutBounds) {
     cutoutBounds.left -= boxLabelCutoutPaddingPx;
-    cutoutBounds.top -= boxLabelCutoutPaddingPx;
     cutoutBounds.right += boxLabelCutoutPaddingPx;
-    cutoutBounds.bottom += boxLabelCutoutPaddingPx;
   }
 
   @VisibleForTesting
@@ -4091,6 +4100,10 @@ void updateTextInputBoxState() {
       boxStrokeWidthPx = boxStrokeWidthDefaultPx;
     }
 
+    if (boxBackgroundMode == BOX_BACKGROUND_OUTLINE) {
+      updateCutout();
+    }
+
     // Update the text box's background color based on the current state.
     if (boxBackgroundMode == BOX_BACKGROUND_FILLED) {
       if (!isEnabled()) {