commit 1c466936138bdc1e27dba259c74d4b27ba9ca91e
author Andrew Lee <anwlee@google.com> Mon Jun 22 18:28:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 22 18:28:31 2015 +0000
tree 420d5b31c6be334fa4c066f04ab08b44a8fa2514
parent 99628457f219ee5b855121bfb41484220119e3e5
parent e91075e5a7f40aafda5e8d88c8ebdc9e38074622

am e91075e5: am c7c0dc82: am 8f25a4d2: Merge "Set FAB to invisible on hide if no animation." into mnc-dev

* commit 'e91075e5a7f40aafda5e8d88c8ebdc9e38074622':
  Set FAB to invisible on hide if no animation.

src/com/android/dialer/dialpad/DialpadFragment.java

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 766175c..5b1e211 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1643,12 +1643,17 @@
             if (mAnimate) {
                 dialpadView.animateShow();
             }
+            mFloatingActionButtonController.setVisible(false);
             mFloatingActionButtonController.scaleIn(mAnimate ? mDialpadSlideInDuration : 0);
             activity.onDialpadShown();
             mDigits.requestFocus();
         }
-        if (hidden && mAnimate) {
-            mFloatingActionButtonController.scaleOut();
+        if (hidden) {
+            if (mAnimate) {
+                mFloatingActionButtonController.scaleOut();
+            } else {
+                mFloatingActionButtonController.setVisible(false);
+            }
         }
     }