diff --git a/lib/java/com/google/android/material/button/MaterialButton.java b/lib/java/com/google/android/material/button/MaterialButton.java index c599a1e1089..d2b49d82a87 100644 --- a/lib/java/com/google/android/material/button/MaterialButton.java +++ b/lib/java/com/google/android/material/button/MaterialButton.java @@ -1722,15 +1722,13 @@ public void toggle() { @Override public boolean performClick() { - boolean toggled = false; - if (isEnabled() && materialButtonHelper.isToggleCheckedStateOnClick()) { + final boolean checkable = isCheckable() && materialButtonHelper.isToggleCheckedStateOnClick(); + if (checkable) { toggle(); - toggled = true; } final boolean handled = super.performClick(); - - if (toggled && !handled) { + if (checkable && !handled) { // View only makes a sound effect if the onClickListener was called, so for checkable button // we'll need to manually make one here instead. playSoundEffect(SoundEffectConstants.CLICK);