diff --git a/src/android/support/design/widget/FloatingActionButton.java b/src/android/support/design/widget/FloatingActionButton.java index 6f830b5d6..1398d5dd2 100644 --- a/src/android/support/design/widget/FloatingActionButton.java +++ b/src/android/support/design/widget/FloatingActionButton.java @@ -32,6 +32,7 @@ import android.support.design.widget.FloatingActionButtonImpl.InternalVisibility import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.util.Log; +import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; @@ -91,6 +92,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton { private int mRippleColor; private int mSize; private int mImagePadding; + private Rect mTouchArea; private boolean mCompatPadding; private final Rect mShadowPadding; @@ -111,6 +113,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton { ThemeUtils.checkAppCompatTheme(context); mShadowPadding = new Rect(); + mTouchArea = new Rect(); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FloatingActionButton, defStyleAttr, @@ -469,6 +472,15 @@ public class FloatingActionButton extends VisibilityAwareImageButton { } } + @Override + public boolean onTouchEvent(MotionEvent ev) { + if(getContentRect(mTouchArea) && !mTouchArea.contains((int) ev.getX(), (int) ev.getY())) { + return false; + } + + return super.onTouchEvent(ev); + } + /** * Behavior designed for use with {@link FloatingActionButton} instances. Its main function * is to move {@link FloatingActionButton} views so that any displayed {@link Snackbar}s do