commit 0b5dab7b74c94bbbe243561226a6610919e51cc4
author Andrew Lee <anwlee@google.com> Thu Aug 28 23:49:03 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 28 23:49:04 2014 +0000
tree 9bd996cded9d4614628561db4a0e701e74862999
parent 66772d9a775de31fc4475da017ae6206a0fcdcc0
parent 955e10d3b07db60791c88f156bb05e568b28f7a2

Merge "Only animate alignment of FAB if the FAB container is shown." into lmp-dev

src/com/android/contacts/common/widget/FloatingActionButtonController.java

diff --git a/src/com/android/contacts/common/widget/FloatingActionButtonController.java b/src/com/android/contacts/common/widget/FloatingActionButtonController.java
index e97cbfc..773e024 100644
--- a/src/com/android/contacts/common/widget/FloatingActionButtonController.java
+++ b/src/com/android/contacts/common/widget/FloatingActionButtonController.java
@@ -105,7 +105,9 @@
         }
 
         int translationX = getTranslationXForAlignment(align);
-        if (animate) {
+
+        // Skip animation if container is not shown; animation causes container to show again.
+        if (animate && mFloatingActionButtonContainer.isShown()) {
             mFloatingActionButtonContainer.animate()
                     .translationX(translationX + offsetX)
                     .translationY(offsetY)