[Switch] Override switch width set by AppCompat to respect the drawable width

PiperOrigin-RevId: 449238028

Author: drchen

lib/java/com/google/android/material/materialswitch/MaterialSwitch.java

@@ -20,6 +20,7 @@
 
 import static com.google.android.material.theme.overlay.MaterialThemeOverlay.wrap;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
@@ -36,6 +37,8 @@
 import androidx.annotation.Nullable;
 import androidx.core.graphics.drawable.DrawableCompat;
 import com.google.android.material.internal.ThemeEnforcement;
+import com.google.android.material.internal.ViewUtils;
+import java.lang.reflect.Field;
 
 /**
  * A class that creates a Material Themed Switch. This class is intended to provide a brand new
@@ -45,6 +48,8 @@
 public class MaterialSwitch extends SwitchCompat {
   private static final int DEF_STYLE_RES = R.style.Widget_Material3_CompoundButton_MaterialSwitch;
 
+  @NonNull private final SwitchWidth switchWidth = SwitchWidth.create(this);
+
   @Nullable private Drawable trackDrawable;
   @Nullable private Drawable trackDecorationDrawable;
 
@@ -86,6 +91,40 @@ public MaterialSwitch(@NonNull Context context, @Nullable AttributeSet attrs, in
     refreshTrackDrawable();
   }
 
+  // TODO(b/227338106): remove this workaround and move to use setEnforceSwitchWidth(false) after
+  //                    AppCompat 1.6.0-stable is released.
+  @Override
+  public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    switchWidth.set(getSwitchMinWidth());
+  }
+
+  // TODO(b/227338106): remove this workaround and move to use setEnforceSwitchWidth(false) after
+  //                    AppCompat 1.6.0-stable is released.
+  @Override
+  public int getCompoundPaddingLeft() {
+    if (!ViewUtils.isLayoutRtl(this)) {
+      return super.getCompoundPaddingLeft();
+    }
+    // Compound paddings are used during onMeasure() to decide the component width, at that time
+    // the switch width is not overridden yet so we need to adjust the value to make measurement
+    // right. This can be removed after the workaround is removed.
+    return super.getCompoundPaddingLeft() - switchWidth.get() + getSwitchMinWidth();
+  }
+
+  // TODO(b/227338106): remove this workaround and move to use setEnforceSwitchWidth(false) after
+  //                    AppCompat 1.6.0-stable is released.
+  @Override
+  public int getCompoundPaddingRight() {
+    if (ViewUtils.isLayoutRtl(this)) {
+      return super.getCompoundPaddingRight();
+    }
+    // Compound paddings are used during onMeasure() to decide the component width, at that time
+    // the switch width is not overridden yet so we need to adjust the value to make measurement
+    // right. This can be removed after the workaround is removed.
+    return super.getCompoundPaddingRight() - switchWidth.get() + getSwitchMinWidth();
+  }
+
   @Override
   public void setTrackDrawable(@Nullable Drawable track) {
     trackDrawable = track;
@@ -214,6 +253,9 @@ private void refreshTrackDrawable() {
     } else {
       finalTrackDrawable = trackDecorationDrawable;
     }
+    if (finalTrackDrawable != null) {
+      setSwitchMinWidth(finalTrackDrawable.getIntrinsicWidth());
+    }
     super.setTrackDrawable(finalTrackDrawable);
   }
 
@@ -231,4 +273,56 @@ private static Drawable setDrawableTintListIfNeeded(
     }
     return drawable;
   }
+
+  // TODO(b/227338106): remove this workaround and move to use setEnforceSwitchWidth(false) after
+  //                    AppCompat 1.6.0-stable is released.
+  @SuppressLint("PrivateApi")
+  private static final class SwitchWidth {
+
+    @NonNull private final MaterialSwitch materialSwitch;
+    @Nullable private final Field switchWidthField;
+
+    @NonNull
+    static SwitchWidth create(@NonNull MaterialSwitch materialSwitch) {
+      return new SwitchWidth(materialSwitch, createSwitchWidthField());
+    }
+
+    private SwitchWidth(@NonNull MaterialSwitch materialSwitch, @Nullable Field switchWidthField) {
+      this.materialSwitch = materialSwitch;
+      this.switchWidthField = switchWidthField;
+    }
+
+    int get() {
+      try {
+        if (switchWidthField != null) {
+          return switchWidthField.getInt(materialSwitch);
+        }
+      } catch (IllegalAccessException e) {
+        // Fall through
+      }
+      // Return getSwitchMinWidth() so no width adjustment will be done.
+      return materialSwitch.getSwitchMinWidth();
+    }
+
+    void set(int switchWidth) {
+      try {
+        if (switchWidthField != null) {
+          switchWidthField.setInt(materialSwitch, switchWidth);
+        }
+      } catch (IllegalAccessException e) {
+        // Fall through
+      }
+    }
+
+    @Nullable
+    private static Field createSwitchWidthField() {
+      try {
+        Field switchWidthField = SwitchCompat.class.getDeclaredField("mSwitchWidth");
+        switchWidthField.setAccessible(true);
+        return switchWidthField;
+      } catch (NoSuchFieldException | SecurityException e) {
+        return null;
+      }
+    }
+  }
 }

lib/javatests/com/google/android/material/appbar/MaterialToolbarTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.material.appbar;
 
-import com.google.android.material.R;
+import com.google.android.material.test.R;
 
 import static com.google.common.truth.Truth.assertThat;
 

lib/javatests/com/google/android/material/badge/BadgeDrawableTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.material.badge;
 
-import com.google.android.material.R;
+import com.google.android.material.test.R;
 
 import static com.google.common.truth.Truth.assertThat;
 

lib/javatests/com/google/android/material/badge/BadgeUtilsTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.material.badge;
 
-import com.google.android.material.R;
+import com.google.android.material.test.R;
 
 import static com.google.common.truth.Truth.assertThat;
 

lib/javatests/com/google/android/material/bottomnavigation/BottomNavigationViewTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.material.bottomnavigation;
 
-import com.google.android.material.R;
+import com.google.android.material.test.R;
 
 import static com.google.common.truth.Truth.assertThat;
 

lib/javatests/com/google/android/material/bottomsheet/BottomSheetBehaviorTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.material.bottomsheet;
 
-import com.google.android.material.R;
+import com.google.android.material.test.R;
 
 import static com.google.common.truth.Truth.assertThat;
 

lib/javatests/com/google/android/material/button/MaterialButtonTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.material.button;
 
-import com.google.android.material.R;
+import com.google.android.material.test.R;
 
 import static com.google.common.truth.Truth.assertThat;
 

lib/javatests/com/google/android/material/button/MaterialButtonToggleGroupTest.java

@@ -16,7 +16,7 @@
 
 package com.google.android.material.button;
 
-import com.google.android.material.R;
+import com.google.android.material.test.R;
 
 import static android.view.View.GONE;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;

lib/javatests/com/google/android/material/checkbox/MaterialCheckBoxTest.java

@@ -16,7 +16,7 @@
 
 package com.google.android.material.checkbox;
 
-import com.google.android.material.R;
+import com.google.android.material.test.R;
 
 import static com.google.common.truth.Truth.assertThat;
 

lib/javatests/com/google/android/material/chip/ChipGroupTest.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.material.chip;
 
-import com.google.android.material.R;
+import com.google.android.material.test.R;
 
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static com.google.common.truth.Truth.assertThat;