Fix chip text mis-alignment when its width is less than the minimum recommended touch target width.

Resolves #800

PiperOrigin-RevId: 286421752

Author: wcshi

lib/java/com/google/android/material/chip/Chip.java

@@ -321,6 +321,16 @@ private void updatePaddingInternal() {
             (chipDrawable.getChipStartPadding()
                 + chipDrawable.getTextStartPadding()
                 + chipDrawable.calculateChipIconWidth());
+    if (insetBackgroundDrawable != null) {
+      Rect padding = new Rect();
+      Log.w("mdc-chip", "padding: " + padding.left + " " + padding.right);
+      insetBackgroundDrawable.getPadding(padding);
+      if (ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL) {
+        paddingEnd += padding.right;
+      } else {
+        paddingStart += padding.left;
+      }
+    }
 
     ViewCompat.setPaddingRelative(
         this, paddingStart, getPaddingTop(), paddingEnd, getPaddingBottom());
@@ -404,7 +414,6 @@ public void setChipDrawable(@NonNull ChipDrawable drawable) {
       chipDrawable.setShouldDrawText(false);
       applyChipDrawable(chipDrawable);
       ensureAccessibleTouchTarget(minTouchTargetSize);
-      updateBackgroundDrawable();
     }
   }
 
@@ -667,7 +676,6 @@ public void setMaxWidth(@Px int maxWidth) {
   @Override
   public void onChipDrawableSizeChange() {
     ensureAccessibleTouchTarget(minTouchTargetSize);
-    updateBackgroundDrawable();
     requestLayout();
     if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
       invalidateOutline();
@@ -2219,15 +2227,23 @@ public void setEnsureMinTouchTargetSize(boolean flag) {
   public boolean ensureAccessibleTouchTarget(@Dimension int minTargetPx) {
     minTouchTargetSize = minTargetPx;
     if (!shouldEnsureMinTouchTargetSize()) {
-      removeBackgroundInset();
+      if (insetBackgroundDrawable != null) {
+        removeBackgroundInset();
+      } else {
+        updateBackgroundDrawable();
+      }
       return false;
     }
 
     int deltaHeight = Math.max(0, minTargetPx - chipDrawable.getIntrinsicHeight());
     int deltaWidth = Math.max(0, minTargetPx - chipDrawable.getIntrinsicWidth());
 
     if (deltaWidth <= 0 && deltaHeight <= 0) {
-      removeBackgroundInset();
+      if (insetBackgroundDrawable != null) {
+        removeBackgroundInset();
+      } else {
+        updateBackgroundDrawable();
+      }
       return false;
     }
 
@@ -2241,6 +2257,7 @@ public boolean ensureAccessibleTouchTarget(@Dimension int minTargetPx) {
           && padding.bottom == deltaY
           && padding.left == deltaX
           && padding.right == deltaX) {
+        updateBackgroundDrawable();
         return true;
       }
     }
@@ -2256,6 +2273,7 @@ public boolean ensureAccessibleTouchTarget(@Dimension int minTargetPx) {
       setMinWidth(minTargetPx);
     }
     insetChipBackgroundDrawable(deltaX, deltaY, deltaX, deltaY);
+    updateBackgroundDrawable();
     return true;
   }