Rename setCornerRadius to setAllCornerSizes

PiperOrigin-RevId: 272959729
(cherry picked from commit 294f124)

Author: cketcham

lib/java/com/google/android/material/badge/BadgeDrawable.java

@@ -676,7 +676,7 @@ private void updateCenterAndBounds() {
 
     updateBadgeBounds(badgeBounds, badgeCenterX, badgeCenterY, halfBadgeWidth, halfBadgeHeight);
 
-    shapeDrawable.setCornerRadius(cornerRadius);
+    shapeDrawable.setCornerSize(cornerRadius);
     if (!tmpRect.equals(badgeBounds)) {
       shapeDrawable.setBounds(badgeBounds);
     }

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

@@ -88,7 +88,7 @@ void loadFromAttributes(@NonNull TypedArray attributes) {
     // cornerRadius should override whatever corner radius is set in shapeAppearanceModel
     if (attributes.hasValue(R.styleable.MaterialButton_cornerRadius)) {
       cornerRadius = attributes.getDimensionPixelSize(R.styleable.MaterialButton_cornerRadius, -1);
-      setShapeAppearanceModel(shapeAppearanceModel.withCornerRadius(cornerRadius));
+      setShapeAppearanceModel(shapeAppearanceModel.withCornerSize(cornerRadius));
       cornerRadiusSet = true;
     }
 
@@ -307,7 +307,7 @@ void setCornerRadius(int cornerRadius) {
       this.cornerRadius = cornerRadius;
       cornerRadiusSet = true;
 
-      setShapeAppearanceModel(shapeAppearanceModel.withCornerRadius(cornerRadius));
+      setShapeAppearanceModel(shapeAppearanceModel.withCornerSize(cornerRadius));
     }
   }
 

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

@@ -499,7 +499,7 @@ private void updateChildShapes() {
                   .setBottomLeftCornerSize(cornerData.bottomLeft);
             } else if (i != 0 && i < numChildren - 1) {
               // Sets corner radii of all middle children to 0
-              shapeAppearanceModelBuilder.setCornerRadius(0);
+              shapeAppearanceModelBuilder.setAllCornerSizes(0);
             } else if (i == (ViewUtils.isLayoutRtl(this) ? 0 : (numChildren - 1))) {
               // Keeps the right corners of the last child in LTR, or the first child in RTL
               shapeAppearanceModelBuilder

lib/java/com/google/android/material/card/MaterialCardViewHelper.java

@@ -133,7 +133,7 @@ public MaterialCardViewHelper(
             .obtainStyledAttributes(attrs, R.styleable.CardView, defStyleAttr, R.style.CardView);
     if (cardViewAttributes.hasValue(R.styleable.CardView_cardCornerRadius)) {
       // If cardCornerRadius is set, let it override the shape appearance.
-      shapeAppearanceModelBuilder.setCornerRadius(
+      shapeAppearanceModelBuilder.setAllCornerSizes(
           cardViewAttributes.getDimension(R.styleable.CardView_cardCornerRadius, 0));
     }
 
@@ -267,7 +267,7 @@ void updateClickable() {
   }
 
   void setCornerRadius(float cornerRadius) {
-    setShapeAppearanceModel(shapeAppearanceModel.withCornerRadius(cornerRadius));
+    setShapeAppearanceModel(shapeAppearanceModel.withCornerSize(cornerRadius));
     fgDrawable.invalidateSelf();
     if (shouldAddCornerPaddingOutsideCardBackground()
         || shouldAddCornerPaddingInsideCardBackground()) {

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

@@ -1143,7 +1143,7 @@ public float getChipCornerRadius() {
   }
 
   /**
-   * @deprecated call {@link ShapeAppearanceModel#withCornerRadius()} or call {@link
+   * @deprecated call {@link ShapeAppearanceModel#withCornerSize()} or call {@link
    *     ShapeAppearanceModel#toBuilder()} on the {@link #getShapeAppearanceModel()}, modify the
    *     shape using the builder and then call {@link
    *     #setShapeAppearanceModel(ShapeAppearanceModel)}.
@@ -1167,7 +1167,7 @@ public ShapeAppearanceModel getShapeAppearanceModel() {
   }
 
   /**
-   * @deprecated call {@link ShapeAppearanceModel#withCornerRadius()} or call {@link
+   * @deprecated call {@link ShapeAppearanceModel#withCornerSize()} or call {@link
    *     ShapeAppearanceModel#toBuilder()} on the {@link #getShapeAppearanceModel()}, modify the
    *     shape using the builder and then call {@link
    *     #setShapeAppearanceModel(ShapeAppearanceModel)}.

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

@@ -1410,7 +1410,7 @@ public float getChipCornerRadius() {
   }
 
   /**
-   * @deprecated call {@link ShapeAppearanceModel#withCornerRadius()} or call {@link
+   * @deprecated call {@link ShapeAppearanceModel#withCornerSize()} or call {@link
    *     ShapeAppearanceModel#toBuilder()} on the {@link #getShapeAppearanceModel()}, modify the
    *     shape using the builder and then call {@link
    *     #setShapeAppearanceModel(ShapeAppearanceModel)}.
@@ -1421,7 +1421,7 @@ public void setChipCornerRadiusResource(@DimenRes int id) {
   }
 
   /**
-   * @deprecated call {@link ShapeAppearanceModel#withCornerRadius()} or call {@link
+   * @deprecated call {@link ShapeAppearanceModel#withCornerSize()} or call {@link
    *     ShapeAppearanceModel#toBuilder()} on the {@link #getShapeAppearanceModel()}, modify the
    *     shape using the builder and then call {@link
    *     #setShapeAppearanceModel(ShapeAppearanceModel)}.
@@ -1431,7 +1431,7 @@ public void setChipCornerRadius(float chipCornerRadius) {
     if (this.chipCornerRadius != chipCornerRadius) {
       this.chipCornerRadius = chipCornerRadius;
 
-      setShapeAppearanceModel(getShapeAppearanceModel().withCornerRadius(chipCornerRadius));
+      setShapeAppearanceModel(getShapeAppearanceModel().withCornerSize(chipCornerRadius));
     }
   }
 

lib/java/com/google/android/material/dialog/MaterialAlertDialogBuilder.java

@@ -130,7 +130,7 @@ public MaterialAlertDialogBuilder(Context context, int overrideThemeResId) {
       float dialogCornerRadius =
           dialogCornerRadiusValue.getDimension(getContext().getResources().getDisplayMetrics());
       if (dialogCornerRadiusValue.type == TypedValue.TYPE_DIMENSION && dialogCornerRadius >= 0) {
-        materialShapeDrawable.setCornerRadius(dialogCornerRadius);
+        materialShapeDrawable.setCornerSize(dialogCornerRadius);
       }
     }
     background = materialShapeDrawable;

lib/java/com/google/android/material/shape/MaterialShapeDrawable.java

@@ -459,8 +459,14 @@ protected RectF getBoundsAsRectF() {
     return rectF;
   }
 
-  public void setCornerRadius(float cornerRadius) {
-    setShapeAppearanceModel(drawableState.shapeAppearanceModel.withCornerRadius(cornerRadius));
+  /** Updates the corners for the given {@link cornerSize}. */
+  public void setCornerSize(float cornerSize) {
+    setShapeAppearanceModel(drawableState.shapeAppearanceModel.withCornerSize(cornerSize));
+  }
+
+  /** Updates the corners for the given {@link cornerSize}. */
+  public void setCornerSize(@NonNull CornerSize cornerSize) {
+    setShapeAppearanceModel(drawableState.shapeAppearanceModel.withCornerSize(cornerSize));
   }
 
   /**

lib/java/com/google/android/material/shape/ShapeAppearanceModel.java

@@ -96,7 +96,7 @@ public Builder(@NonNull ShapeAppearanceModel other) {
     @NonNull
     public Builder setAllCorners(@CornerFamily int cornerFamily, @Dimension float cornerSize) {
       return setAllCorners(MaterialShapeUtils.createCornerTreatment(cornerFamily))
-          .setCornerRadius(cornerSize);
+          .setAllCornerSizes(cornerSize);
     }
 
     /**
@@ -125,13 +125,13 @@ public Builder setAllCornerSizes(@NonNull CornerSize cornerSize) {
           .setBottomLeftCornerSize(cornerSize);
     }
 
-    /** Sets the corner size of all four corner treatments to {@code cornerRadius}. */
+    /** Sets the corner size of all four corner treatments to {@code cornerSize}. */
     @NonNull
-    public Builder setCornerRadius(@Dimension float cornerRadius) {
-      return setTopLeftCornerSize(cornerRadius)
-          .setTopRightCornerSize(cornerRadius)
-          .setBottomRightCornerSize(cornerRadius)
-          .setBottomLeftCornerSize(cornerRadius);
+    public Builder setAllCornerSizes(@Dimension float cornerSize) {
+      return setTopLeftCornerSize(cornerSize)
+          .setTopRightCornerSize(cornerSize)
+          .setBottomRightCornerSize(cornerSize)
+          .setBottomLeftCornerSize(cornerSize);
     }
 
     /** Sets the top left corner size for the current corner. */
@@ -561,7 +561,7 @@ private static CornerSize getCornerSize(
     }
   }
 
-  // Constant corner radius value to indicate that shape should use 50% height corner radii
+  // Constant corner size value to indicate that shape should use 50% height corner radii
   public static final CornerSize PILL = new RelativeCornerSize(0.5f);
 
   CornerTreatment topLeftCorner;
@@ -740,11 +740,11 @@ public Builder toBuilder() {
 
   /**
    * Returns a copy of this {@link ShapeAppearanceModel} with the same edges and corners, but with
-   * the corner radius for all corners updated.
+   * the corner size for all corners updated.
    */
   @NonNull
-  public ShapeAppearanceModel withCornerRadius(float cornerRadius) {
-    return toBuilder().setCornerRadius(cornerRadius).build();
+  public ShapeAppearanceModel withCornerSize(float cornerSize) {
+    return toBuilder().setAllCornerSizes(cornerSize).build();
   }
 
   @NonNull
@@ -765,7 +765,7 @@ public interface CornerSizeUnaryOperator {
 
   /**
    * Returns a copy of this {@link ShapeAppearanceModel} with the same edges and corners, but with
-   * the corner radius for all corners converted by a {@link CornerSizeUnaryOperator}.
+   * the corner size for all corners converted by a {@link CornerSizeUnaryOperator}.
    *
    * @hide
    */

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

@@ -58,7 +58,7 @@ public void themeApplicationContext() {
   public void testSetShapeAppearanceModel_setCornerRadius() {
     MaterialButton materialButton = new MaterialButton(context);
     ShapeAppearanceModel shapeAppearanceModel =
-        ShapeAppearanceModel.builder().setCornerRadius(LARGE_CORNER_SIZE).build();
+        ShapeAppearanceModel.builder().setAllCornerSizes(LARGE_CORNER_SIZE).build();
 
     materialButton.setShapeAppearanceModel(shapeAppearanceModel);