diff --git a/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java b/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
index cfce05292f6..4daf568574a 100644
--- a/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
+++ b/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
@@ -73,6 +73,7 @@
import com.google.android.material.internal.ThemeEnforcement;
import com.google.android.material.internal.ViewUtils;
import com.google.android.material.internal.VisibilityAwareImageButton;
+import com.google.android.material.resources.MaterialAttributes;
import com.google.android.material.resources.MaterialResources;
import com.google.android.material.shadow.ShadowViewDelegate;
import com.google.android.material.shape.ShapeAppearanceModel;
@@ -237,8 +238,6 @@ public FloatingActionButton(
final float pressedTranslationZ =
a.getDimension(R.styleable.FloatingActionButton_pressedTranslationZ, 0f);
compatPadding = a.getBoolean(R.styleable.FloatingActionButton_useCompatPadding, false);
- int minTouchTargetSize =
- getResources().getDimensionPixelSize(R.dimen.mtrl_fab_min_touch_target);
setMaxImageSize(a.getDimensionPixelSize(R.styleable.FloatingActionButton_maxImageSize, 0));
@@ -254,6 +253,11 @@ public FloatingActionButton(
boolean ensureMinTouchTargetSize =
a.getBoolean(R.styleable.FloatingActionButton_ensureMinTouchTargetSize, false);
+ int minTouchTargetSize =
+ a.getDimensionPixelSize(
+ R.styleable.FloatingActionButton_minTouchTargetSize,
+ MaterialAttributes.resolveMinimumAccessibleTouchTarget(context));
+
setEnabled(a.getBoolean(R.styleable.FloatingActionButton_android_enabled, true));
a.recycle();
diff --git a/lib/java/com/google/android/material/floatingactionbutton/res/values/attrs.xml b/lib/java/com/google/android/material/floatingactionbutton/res/values/attrs.xml
index d4b1ee11ea6..6256a0df96c 100644
--- a/lib/java/com/google/android/material/floatingactionbutton/res/values/attrs.xml
+++ b/lib/java/com/google/android/material/floatingactionbutton/res/values/attrs.xml
@@ -38,9 +38,10 @@
-
+
+
+
diff --git a/lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml b/lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml
index 941e6045bf3..5536744aa71 100644
--- a/lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml
+++ b/lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml
@@ -376,6 +376,7 @@
- @null
- true
- true
+ - @dimen/mtrl_fab_min_touch_target
- @dimen/mtrl_fab_elevation
- @color/mtrl_fab_bg_color_selector
- @color/mtrl_fab_icon_text_color_selector