Merge pull request #548 from material-components/revert-533-material-button-issue-531

Revert "[MaterialButton] Fixed issue 531 by removing unnecessary calls to set compound drawables"

Author: ymarian

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

@@ -663,18 +663,7 @@ private void updateIcon() {
       icon.setBounds(iconLeft, 0, iconLeft + width, height);
     }
 
-    // Only update if the icon or the position has changed
-    boolean isIconStart = iconGravity == ICON_GRAVITY_START || iconGravity == ICON_GRAVITY_TEXT_START;
-    Drawable[] existingDrawables = TextViewCompat.getCompoundDrawablesRelative(this);
-    Drawable drawableStart = existingDrawables[0];
-    Drawable drawableEnd = existingDrawables[2];
-    boolean hasIconChanged = isIconStart && drawableStart != icon || !isIconStart && drawableEnd != icon;
-
-    if(!hasIconChanged) {
-      return;
-    }
-
-    if (isIconStart) {
+    if (iconGravity == ICON_GRAVITY_START || iconGravity == ICON_GRAVITY_TEXT_START) {
       TextViewCompat.setCompoundDrawablesRelative(this, icon, null, null, null);
     } else {
       TextViewCompat.setCompoundDrawablesRelative(this, null, null, icon, null);

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

@@ -24,15 +24,12 @@
 import com.google.android.material.shape.CornerTreatment;
 import com.google.android.material.shape.CutCornerTreatment;
 import com.google.android.material.shape.ShapeAppearanceModel;
-import androidx.core.content.ContextCompat;
 import androidx.test.core.app.ApplicationProvider;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.internal.DoNotInstrument;
-import android.graphics.drawable.Drawable;
-import android.view.View.MeasureSpec;
 
 /** Tests for {@link com.google.android.material.button.MaterialButton}. */
 @RunWith(RobolectricTestRunner.class)
@@ -94,27 +91,6 @@ public void testGetShapeAppearanceModel() {
         materialButton.getShapeAppearanceModel(), CUT_CORNER_FAMILY_CLASS);
   }
 
-  @Test
-  public void setIcon_IconUpdated_whenCalledTwice() {
-    MaterialButton materialButton = new MaterialButton(context);
-    materialButton.setText("test");
-    int measureSpec =
-        MeasureSpec.makeMeasureSpec(200, MeasureSpec.AT_MOST);
-
-    Drawable drawable1 = ContextCompat.getDrawable(context, android.R.drawable.btn_plus);
-    materialButton.setIcon(drawable1);
-    materialButton.setIconGravity(MaterialButton.ICON_GRAVITY_START);
-    materialButton.measure(measureSpec, measureSpec);
-
-    assertThat(materialButton.getIcon()).isEqualTo(drawable1);
-
-    Drawable drawable2 = ContextCompat.getDrawable(context, android.R.drawable.btn_minus);
-    materialButton.setIcon(drawable2);
-    materialButton.measure(measureSpec, measureSpec);
-
-    assertThat(materialButton.getIcon()).isEqualTo(drawable2);
-  }
-
   private void assertThatCornerFamilyMatches(
       ShapeAppearanceModel shapeAppearanceModel,
       Class<? extends CornerTreatment> expectedCornerFamily) {