commit 8f25a4d230989a184aa64c80330503d3fabe8490
author Andrew Lee <anwlee@google.com> Mon Jun 22 17:46:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 22 17:46:14 2015 +0000
tree a95c885741ebd0d8b8b1a8a4386d2a94e319967f
parent f3ec8ad515ec344acd53fa4acaa9df4cad0c2306
parent 200bb14d08e8162e893eec2ca928491d75eab8e0

Merge "Set FAB to invisible on hide if no animation." into mnc-dev

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);
+            }
         }
     }