From 29ae4ae721a1f6d89a8fdca0fd4d49a1e5ecc4a7 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Tue, 9 Sep 2014 16:30:34 -0700
Subject: Set the visibility of the FAB correctly even if mAnimate is false

When launching directly into the dialpad from a dial intent, the
FAB wasn't getting shown sometimes due to animation being skipped.
Make sure to force it to appear regardless of whether animation is
required.

Bug: 17443578
Change-Id: Ic53628b9792038cda0e3e447e5268e8e6fd22190
---
 src/com/android/dialer/dialpad/DialpadFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '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 169b9f3c4..ee1d63438 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1608,8 +1608,8 @@ public class DialpadFragment extends AnalyticsFragment
         if (!hidden) {
             if (mAnimate) {
                 dialpadView.animateShow();
-                mFloatingActionButtonController.scaleIn(mDialpadSlideInDuration);
             }
+            mFloatingActionButtonController.scaleIn(mAnimate ? mDialpadSlideInDuration : 0);
             activity.onDialpadShown();
             mDigits.requestFocus();
         }
-- 
cgit v1.2.3