Fix interpolation for MSD round rects

PiperOrigin-RevId: 296281750

Author: ymarian

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

@@ -467,12 +467,12 @@ protected RectF getBoundsAsRectF() {
     return rectF;
   }
 
-  /** Updates the corners for the given {@link cornerSize}. */
+  /** 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}. */
+  /** Updates the corners for the given {@link CornerSize}. */
   public void setCornerSize(@NonNull CornerSize cornerSize) {
     setShapeAppearanceModel(drawableState.shapeAppearanceModel.withCornerSize(cornerSize));
   }
@@ -1028,7 +1028,9 @@ private void drawShape(
       @NonNull ShapeAppearanceModel shapeAppearanceModel,
       @NonNull RectF bounds) {
     if (shapeAppearanceModel.isRoundRect(bounds)) {
-      float cornerSize = shapeAppearanceModel.getTopRightCornerSize().getCornerSize(bounds);
+      float cornerSize =
+          shapeAppearanceModel.getTopRightCornerSize().getCornerSize(bounds)
+              * drawableState.interpolation;
       canvas.drawRoundRect(bounds, cornerSize, cornerSize, paint);
     } else {
       canvas.drawPath(path, paint);
@@ -1171,7 +1173,7 @@ public void getOutline(@NonNull Outline outline) {
     }
 
     if (isRoundRect()) {
-      float radius = getTopLeftCornerResolvedSize();
+      float radius = getTopLeftCornerResolvedSize() * drawableState.interpolation;
       outline.setRoundRect(getBounds(), radius);
       return;
     }

lib/javatests/com/google/android/material/shape/MaterialShapeDrawableTest.java

@@ -26,11 +26,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.internal.DoNotInstrument;
 
 /** Tests for {@link MaterialShapeDrawable}. */
 @RunWith(RobolectricTestRunner.class)
-@DoNotInstrument
 public class MaterialShapeDrawableTest {
 
   private static final float ELEVATION = 4;