[ButtonGroup] Fixed the bug of size morph not working with layout_weight.

PiperOrigin-RevId: 748859113

Author: pekingme

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

@@ -56,6 +56,7 @@
 import android.widget.Checkable;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
 import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
@@ -247,6 +248,8 @@ interface OnPressedChangeListener {
   @Px private int originalPaddingStart = UNSET;
   @Px private int originalPaddingEnd = UNSET;
 
+  @Nullable private LayoutParams originalLayoutParams;
+
   // Fields for optical center.
   private boolean opticalCenterEnabled;
   private int opticalCenterShift;
@@ -270,7 +273,7 @@ public MaterialButton(@NonNull Context context, @Nullable AttributeSet attrs) {
 
   public MaterialButton(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
     super(
-        wrap(context, attrs, defStyleAttr, DEF_STYLE_RES, new int[] { MATERIAL_SIZE_OVERLAY_ATTR }),
+        wrap(context, attrs, defStyleAttr, DEF_STYLE_RES, new int[] {MATERIAL_SIZE_OVERLAY_ATTR}),
         attrs,
         defStyleAttr);
     // Ensure we are using the correctly themed context rather than the context that was passed in.
@@ -324,7 +327,9 @@ private void initializeSizeAnimation() {
   }
 
   private SpringForce createSpringForce() {
-    return MotionUtils.resolveThemeSpringForce(getContext(), R.attr.motionSpringFastSpatial,
+    return MotionUtils.resolveThemeSpringForce(
+        getContext(),
+        R.attr.motionSpringFastSpatial,
         R.style.Motion_Material3_Spring_Standard_Fast_Spatial);
   }
 
@@ -538,7 +543,19 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
       originalWidth = UNSET;
     }
     if (originalWidth == UNSET) {
-      originalWidth = right - left;
+      originalWidth = getMeasuredWidth();
+      // The width morph leverage the width of the layout params. However, it's not available if
+      // layout_weight is used. We need to hardcode the width here. The original layout params will
+      // be preserved for the correctness of distribution when buttons are added or removed into the
+      // group programmatically.
+      if (originalLayoutParams == null
+          && getParent() instanceof MaterialButtonGroup
+          && ((MaterialButtonGroup) getParent()).getButtonSizeChange() != null) {
+        originalLayoutParams = (LayoutParams) getLayoutParams();
+        LayoutParams newLayoutParams = new LayoutParams(originalLayoutParams);
+        newLayoutParams.width = (int) originalWidth;
+        setLayoutParams(newLayoutParams);
+      }
     }
 
     if (allowedWidthDecrease == UNSET) {
@@ -557,6 +574,14 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
     }
   }
 
+  void recoverOriginalLayoutParams() {
+    if (originalLayoutParams != null) {
+      setLayoutParams(originalLayoutParams);
+      originalLayoutParams = null;
+      originalWidth = UNSET;
+    }
+  }
+
   @Override
   public void setWidth(@Px int pixels) {
     originalWidth = UNSET;
@@ -1539,7 +1564,7 @@ private float getDisplayedWidthIncrease() {
   private void setDisplayedWidthIncrease(float widthIncrease) {
     if (displayedWidthIncrease != widthIncrease) {
       displayedWidthIncrease = widthIncrease;
-      updatePaddingsAndSize();
+      updatePaddingsAndSizeForWidthAnimation();
       invalidate();
       // Report width changed to the parent group.
       if (getParent() instanceof MaterialButtonGroup) {
@@ -1551,7 +1576,7 @@ private void setDisplayedWidthIncrease(float widthIncrease) {
 
   void setDisplayedWidthDecrease(int widthDecrease) {
     displayedWidthDecrease = min(widthDecrease, allowedWidthDecrease);
-    updatePaddingsAndSize();
+    updatePaddingsAndSizeForWidthAnimation();
     invalidate();
   }
 
@@ -1570,7 +1595,7 @@ public void setOpticalCenterEnabled(boolean opticalCenterEnabled) {
               int opticalCenterShift = (int) (diffX * OPTICAL_CENTER_RATIO);
               if (this.opticalCenterShift != opticalCenterShift) {
                 this.opticalCenterShift = opticalCenterShift;
-                updatePaddingsAndSize();
+                updatePaddingsAndSizeForWidthAnimation();
                 invalidate();
               }
             });
@@ -1582,7 +1607,7 @@ public void setOpticalCenterEnabled(boolean opticalCenterEnabled) {
       post(
           () -> {
             opticalCenterShift = getOpticalCenterShift();
-            updatePaddingsAndSize();
+            updatePaddingsAndSizeForWidthAnimation();
             invalidate();
           });
     }
@@ -1597,7 +1622,7 @@ public boolean isOpticalCenterEnabled() {
     return opticalCenterEnabled;
   }
 
-  private void updatePaddingsAndSize() {
+  private void updatePaddingsAndSizeForWidthAnimation() {
     int widthChange = (int) (displayedWidthIncrease - displayedWidthDecrease);
     int paddingStartChange = widthChange / 2 + opticalCenterShift;
     getLayoutParams().width = (int) (originalWidth + widthChange);

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

@@ -206,6 +206,9 @@ public void addView(@NonNull View child, int index, @Nullable ViewGroup.LayoutPa
       return;
     }
 
+    // Recover the original layout params of all children before adding the new child.
+    recoverAllChildrenLayoutParams();
+
     isChildrenShapeInvalidated = true;
     super.addView(child, index, params);
     MaterialButton buttonChild = (MaterialButton) child;
@@ -236,9 +239,19 @@ public void onViewRemoved(View child) {
 
     isChildrenShapeInvalidated = true;
     updateChildShapes();
+
+    // Recover the original layout params of all children before updating the child layout.
+    recoverAllChildrenLayoutParams();
     adjustChildMarginsAndUpdateLayout();
   }
 
+  private void recoverAllChildrenLayoutParams(){
+    for (int i = 0; i < getChildCount(); i++) {
+      MaterialButton child = getChildButton(i);
+      child.recoverOriginalLayoutParams();
+    }
+  }
+
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     updateChildShapes();
@@ -250,6 +263,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
   protected void onLayout(boolean changed, int l, int t, int r, int b) {
     super.onLayout(changed, l, t, r, b);
     if (changed) {
+      recoverAllChildrenLayoutParams();
       adjustChildSizeChange();
     }
   }