commit c010d657a2553ba49490c3d99e0c0b056c26bad9
author Chris Banes <chrisbanes@google.com> Mon Aug 22 09:58:24 2016 +0100
committer Chris Banes <chrisbanes@google.com> Mon Aug 22 09:58:24 2016 +0100
tree 04d4484cebf6e9884b5469ed4e64282d2ffc35c9
parent cd2dfdc7910514bec8ac76b8fce6135c85493956

Fix FloatingActionButton with nested anchors

BUG: 30971436
Change-Id: I62cd51a007e2941ef9a46357090778b143b2b51a

design/src/android/support/design/widget/FloatingActionButton.java

diff --git a/design/src/android/support/design/widget/FloatingActionButton.java b/design/src/android/support/design/widget/FloatingActionButton.java
index 526596c..68b7c5b 100644
--- a/design/src/android/support/design/widget/FloatingActionButton.java
+++ b/design/src/android/support/design/widget/FloatingActionButton.java
@@ -41,6 +41,7 @@
 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;
@@ -592,10 +593,13 @@
             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