From 19a237dc74e87b0555221cb4abff09ff4f655d41 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Wed, 30 Nov 2016 05:09:17 +0000 Subject: [PATCH] Fix FloatingActionButton with nested anchors am: c010d657a2 Change-Id: I1207b1e5c6cff1716f68aeb83925e3024782172a GitOrigin-RevId=3c2f33358e275fadb3a8012f71b620233876b4ca PiperOrigin-RevId: 140564491 --- .../support/design/widget/FloatingActionButton.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/android/support/design/widget/FloatingActionButton.java b/src/android/support/design/widget/FloatingActionButton.java index f3fc67a70..6433aaeb5 100644 --- a/src/android/support/design/widget/FloatingActionButton.java +++ b/src/android/support/design/widget/FloatingActionButton.java @@ -41,6 +41,7 @@ import android.util.Log; import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.view.ViewGroup; import android.widget.ImageView; import java.lang.annotation.Retention; @@ -604,10 +605,13 @@ public class FloatingActionButton extends VisibilityAwareImageButton { return false; } - private static boolean isBottomSheet(View view) { - CoordinatorLayout.LayoutParams lp = - (CoordinatorLayout.LayoutParams) view.getLayoutParams(); - return lp != null && lp.getBehavior() instanceof BottomSheetBehavior; + private static boolean isBottomSheet(@NonNull View view) { + final ViewGroup.LayoutParams lp = view.getLayoutParams(); + if (lp instanceof CoordinatorLayout.LayoutParams) { + return ((CoordinatorLayout.LayoutParams) lp) + .getBehavior() instanceof BottomSheetBehavior; + } + return false; } @VisibleForTesting