From 697d1cbeae39588f060c50ab182da86688db26b3 Mon Sep 17 00:00:00 2001 From: jzeferino Date: Mon, 9 Nov 2015 15:34:08 +0000 Subject: [PATCH] Fixed permanent tint in label and button when canceling the click. --- .../java/com/github/clans/fab/FloatingActionButton.java | 9 ++++++++- library/src/main/java/com/github/clans/fab/Label.java | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/github/clans/fab/FloatingActionButton.java b/library/src/main/java/com/github/clans/fab/FloatingActionButton.java index 0fec7af..ea72dd2 100755 --- a/library/src/main/java/com/github/clans/fab/FloatingActionButton.java +++ b/library/src/main/java/com/github/clans/fab/FloatingActionButton.java @@ -557,9 +557,16 @@ public boolean onTouchEvent(MotionEvent event) { if (label != null) { label.onActionUp(); } + onActionUp(); break; - } + case MotionEvent.ACTION_CANCEL: + if (label != null) { + label.onActionUp(); + } + onActionUp(); + break; + } mGestureDetector.onTouchEvent(event); } return super.onTouchEvent(event); diff --git a/library/src/main/java/com/github/clans/fab/Label.java b/library/src/main/java/com/github/clans/fab/Label.java index 63e85c8..b9c5169 100755 --- a/library/src/main/java/com/github/clans/fab/Label.java +++ b/library/src/main/java/com/github/clans/fab/Label.java @@ -291,6 +291,11 @@ public boolean onTouchEvent(MotionEvent event) { onActionUp(); mFab.onActionUp(); break; + + case MotionEvent.ACTION_CANCEL: + onActionUp(); + mFab.onActionUp(); + break; } mGestureDetector.onTouchEvent(event);