DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix FloatingActionButton with nested anchors

Browse Source 
am: c010d657a2

Change-Id: I1207b1e5c6cff1716f68aeb83925e3024782172a

GitOrigin-RevId=3c2f33358e275fadb3a8012f71b620233876b4ca

PiperOrigin-RevId: 140564491
This commit is contained in:
Chris Banes 2016-11-30 05:09:17 +00:00 committed by Travis Collins
parent a7b5da56b2
commit 19a237dc74
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/android/support/design/widget/FloatingActionButton.java
View File

@ -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