From 21151a5031ca93e133b214d5a2ae5aede1723f2e Mon Sep 17 00:00:00 2001 From: seven332 Date: Sat, 7 May 2016 14:02:37 +0800 Subject: [PATCH] Fix FabLayout onClick mExpanded blocked onClickPrimaryFab and onClickSecondaryFab before. But it should only block onClickSecondaryFab --- app/src/main/java/com/hippo/widget/FabLayout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hippo/widget/FabLayout.java b/app/src/main/java/com/hippo/widget/FabLayout.java index 4fa35585a..913e7d183 100644 --- a/app/src/main/java/com/hippo/widget/FabLayout.java +++ b/app/src/main/java/com/hippo/widget/FabLayout.java @@ -353,11 +353,11 @@ public class FabLayout extends ViewGroup implements View.OnClickListener { public void onClick(View v) { if (this == v) { setExpanded(false); - } else if (mOnClickFabListener != null && mExpanded) { + } else if (mOnClickFabListener != null) { int position = indexOfChild(v); if (position == getChildCount() - 1) { mOnClickFabListener.onClickPrimaryFab(this, (FloatingActionButton) v); - } else if (position >= 0) { + } else if (position >= 0 && mExpanded) { mOnClickFabListener.onClickSecondaryFab(this, (FloatingActionButton) v, position); } }