summaryrefslogtreecommitdiffstats
path: root/src/com/android/dialer/dialpad
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-09-09 16:30:34 -0700
committerYorke Lee <yorkelee@google.com>2014-09-09 16:30:34 -0700
commit29ae4ae721a1f6d89a8fdca0fd4d49a1e5ecc4a7 (patch)
treece9f937579520826be7541a4c3d07cb3ab113c74 /src/com/android/dialer/dialpad
parent03610993bf2adf12a6962c32851095551ffd0043 (diff)
downloadandroid_packages_apps_Dialer-29ae4ae721a1f6d89a8fdca0fd4d49a1e5ecc4a7.tar.gz
android_packages_apps_Dialer-29ae4ae721a1f6d89a8fdca0fd4d49a1e5ecc4a7.tar.bz2
android_packages_apps_Dialer-29ae4ae721a1f6d89a8fdca0fd4d49a1e5ecc4a7.zip
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
Diffstat (limited to 'src/com/android/dialer/dialpad')
-rw-r--r--src/com/android/dialer/dialpad/DialpadFragment.java2
1 files changed, 1 insertions, 1 deletions
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();
}