Remove isVisibility check before scaleIn.
Turns out, assumption that we'd never want to scaleIn a visible FAB is false.
If the FAB is in the middle of a transition (eg. scaling out), it cancels
that animation, and some states can conflict. It's possible to fix these in
this statement, but... at this point, it just seems more conservative just
to leave it the way it was working before and address the FAB case in Dialer
differently.
Bug: 21938194
Bug: 22070516
Change-Id: I5e5f88af71faed4ce603e21b00f526e829e6d3fc
diff --git a/src/com/android/contacts/common/widget/FloatingActionButtonController.java b/src/com/android/contacts/common/widget/FloatingActionButtonController.java
index 31f44af..eb69d3c 100644
--- a/src/com/android/contacts/common/widget/FloatingActionButtonController.java
+++ b/src/com/android/contacts/common/widget/FloatingActionButtonController.java
@@ -82,7 +82,7 @@
mFloatingActionButtonContainer.setVisibility(visible ? View.VISIBLE : View.GONE);
}
- private boolean isVisible() {
+ public boolean isVisible() {
return mFloatingActionButtonContainer.getVisibility() == View.VISIBLE;
}
@@ -167,12 +167,6 @@
* @param delayMs The delay for the effect, in milliseconds.
*/
public void scaleIn(int delayMs) {
- if (isVisible()) {
- mFloatingActionButtonContainer.setScaleX(1);
- mFloatingActionButtonContainer.setScaleY(1);
- return;
- }
-
setVisible(true);
AnimUtils.scaleIn(mFloatingActionButtonContainer, FAB_SCALE_IN_DURATION, delayMs);
AnimUtils.fadeIn(mFloatingActionButton, FAB_SCALE_IN_DURATION,