[MaterialButton] Material button lollipop shape fix

Resolves #2331
Resolves #1797

GIT_ORIGIN_REV_ID=cd176426395bf93f701c623c00947384aabf0706
PiperOrigin-RevId: 393405994

Author: vicmns

build.gradle

@@ -24,7 +24,7 @@ ext {
   targetSdkVersion = 31
 
   androidXVersions = [
-    annotation            : '1.0.1',
+    annotation            : '1.2.0',
     appCompat             : '1.1.0',
     cardView              : '1.0.0',
     constraintlayout      : '2.0.1',

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

@@ -33,6 +33,7 @@
 import android.os.Build.VERSION_CODES;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
+import androidx.annotation.ChecksSdkIntAtLeast;
 import androidx.annotation.Dimension;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -50,7 +51,11 @@
 @RestrictTo(LIBRARY_GROUP)
 class MaterialButtonHelper {
 
-  private static final boolean IS_LOLLIPOP = VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP;
+  @ChecksSdkIntAtLeast(api = VERSION_CODES.LOLLIPOP)
+  private static final boolean IS_MIN_LOLLIPOP = VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP;
+
+  private static final boolean IS_LOLLIPOP =
+      VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && VERSION.SDK_INT <= VERSION_CODES.LOLLIPOP_MR1;
   private final MaterialButton materialButton;
   @NonNull private ShapeAppearanceModel shapeAppearanceModel;
 
@@ -218,7 +223,7 @@ private Drawable createBackground() {
             ? MaterialColors.getColor(materialButton, R.attr.colorSurface)
             : Color.TRANSPARENT);
 
-    if (IS_LOLLIPOP) {
+    if (IS_MIN_LOLLIPOP) {
       maskDrawable = new MaterialShapeDrawable(shapeAppearanceModel);
       DrawableCompat.setTint(maskDrawable, Color.WHITE);
       rippleDrawable =
@@ -255,12 +260,13 @@ void setBackgroundColor(int color) {
   void setRippleColor(@Nullable ColorStateList rippleColor) {
     if (this.rippleColor != rippleColor) {
       this.rippleColor = rippleColor;
-      if (IS_LOLLIPOP && materialButton.getBackground() instanceof RippleDrawable) {
+      if (IS_MIN_LOLLIPOP && materialButton.getBackground() instanceof RippleDrawable) {
         ((RippleDrawable) materialButton.getBackground())
             .setColor(RippleUtils.sanitizeRippleDrawableColor(rippleColor));
-      } else if (!IS_LOLLIPOP && materialButton.getBackground() instanceof RippleDrawableCompat) {
-        ((RippleDrawableCompat) materialButton.getBackground()).setTintList(
-            RippleUtils.sanitizeRippleDrawableColor(rippleColor));
+      } else if (!IS_MIN_LOLLIPOP
+          && materialButton.getBackground() instanceof RippleDrawableCompat) {
+        ((RippleDrawableCompat) materialButton.getBackground())
+            .setTintList(RippleUtils.sanitizeRippleDrawableColor(rippleColor));
       }
     }
   }
@@ -326,7 +332,7 @@ int getCornerRadius() {
   @Nullable
   private MaterialShapeDrawable getMaterialShapeDrawable(boolean getSurfaceColorStrokeDrawable) {
     if (rippleDrawable != null && rippleDrawable.getNumberOfLayers() > 0) {
-      if (IS_LOLLIPOP) {
+      if (IS_MIN_LOLLIPOP) {
         InsetDrawable insetDrawable = (InsetDrawable) rippleDrawable.getDrawable(0);
         LayerDrawable layerDrawable = (LayerDrawable) insetDrawable.getDrawable();
         return (MaterialShapeDrawable)
@@ -359,14 +365,28 @@ private MaterialShapeDrawable getSurfaceColorStrokeDrawable() {
   }
 
   private void updateButtonShape(@NonNull ShapeAppearanceModel shapeAppearanceModel) {
-    if (getMaterialShapeDrawable() != null) {
-      getMaterialShapeDrawable().setShapeAppearanceModel(shapeAppearanceModel);
-    }
-    if (getSurfaceColorStrokeDrawable() != null) {
-      getSurfaceColorStrokeDrawable().setShapeAppearanceModel(shapeAppearanceModel);
-    }
-    if (getMaskDrawable() != null) {
-      getMaskDrawable().setShapeAppearanceModel(shapeAppearanceModel);
+      // There seems to be a bug to drawables that is affecting Lollipop, since invalidation is not
+      // changing an existing drawable shape. This is a fallback.
+    if (IS_LOLLIPOP && !backgroundOverwritten) {
+      // Store padding before setting background, since background overwrites padding values
+      int paddingStart = ViewCompat.getPaddingStart(materialButton);
+      int paddingTop = materialButton.getPaddingTop();
+      int paddingEnd = ViewCompat.getPaddingEnd(materialButton);
+      int paddingBottom = materialButton.getPaddingBottom();
+      updateBackground();
+      // Set the stored padding values
+      ViewCompat.setPaddingRelative(
+          materialButton, paddingStart, paddingTop, paddingEnd, paddingBottom);
+    } else {
+      if (getMaterialShapeDrawable() != null) {
+        getMaterialShapeDrawable().setShapeAppearanceModel(shapeAppearanceModel);
+      }
+      if (getSurfaceColorStrokeDrawable() != null) {
+        getSurfaceColorStrokeDrawable().setShapeAppearanceModel(shapeAppearanceModel);
+      }
+      if (getMaskDrawable() != null) {
+        getMaskDrawable().setShapeAppearanceModel(shapeAppearanceModel);
+      }
     }
   }
 
@@ -431,5 +451,4 @@ private void setVerticalInsets(@Dimension int newInsetTop, @Dimension int newIns
   public int getInsetTop() {
     return insetTop;
   }
-
 }

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

@@ -21,6 +21,7 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import androidx.core.graphics.drawable.DrawableCompat;
 import android.view.View.MeasureSpec;
 import androidx.annotation.Nullable;
@@ -36,9 +37,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-/**
- * Tests for {@link com.google.android.material.button.MaterialButton}.
- */
+/** Tests for {@link com.google.android.material.button.MaterialButton}. */
 @RunWith(RobolectricTestRunner.class)
 public class MaterialButtonTest {
 
@@ -64,9 +63,22 @@ public void testSetShapeAppearanceModel_setCornerRadius() {
 
     ShapeAppearanceModel newShapeAppearanceModel = materialButton.getShapeAppearanceModel();
 
+    assertThat(shapeAppearanceModel).isSameInstanceAs(newShapeAppearanceModel);
     assertThatCornerSizesMatch(shapeAppearanceModel, newShapeAppearanceModel);
   }
 
+  @Test
+  @Config(sdk = Build.VERSION_CODES.LOLLIPOP)
+  public void testShapeRippleDrawableInLollipop() {
+    MaterialButton materialButton = new MaterialButton(context);
+    ShapeAppearanceModel shapeAppearanceModel = materialButton.getShapeAppearanceModel();
+
+    materialButton.setCornerRadius((int) LARGE_CORNER_SIZE);
+    ShapeAppearanceModel newShapeAppearanceModel = materialButton.getShapeAppearanceModel();
+    assertThat(shapeAppearanceModel).isNotSameInstanceAs(newShapeAppearanceModel);
+    assertThat(shapeAppearanceModel).isNotEqualTo(newShapeAppearanceModel);
+  }
+
   @Test
   public void testSetShapeAppearanceModel() {
     MaterialButton materialButton = new MaterialButton(context);
@@ -140,16 +152,19 @@ public void setIcon_iconUpdated_whenCalledTwice() {
   @Config(minSdk = 23, maxSdk = 28)
   public void setIcon_iconNotUpdated_whenPositionChanged() {
     callCount = 0;
-    MaterialButton materialButton = new MaterialButton(context) {
-
-      @Override
-      public void setCompoundDrawablesRelative(@Nullable Drawable left,
-          @Nullable Drawable top, @Nullable Drawable right,
-          @Nullable Drawable bottom) {
-        super.setCompoundDrawablesRelative(left, top, right, bottom);
-        callCount++;
-      }
-    };
+    MaterialButton materialButton =
+        new MaterialButton(context) {
+
+          @Override
+          public void setCompoundDrawablesRelative(
+              @Nullable Drawable left,
+              @Nullable Drawable top,
+              @Nullable Drawable right,
+              @Nullable Drawable bottom) {
+            super.setCompoundDrawablesRelative(left, top, right, bottom);
+            callCount++;
+          }
+        };
 
     Drawable drawable = ContextCompat.getDrawable(context, android.R.drawable.btn_plus);
     setIcon(materialButton, makeMeasureSpec(200), drawable);