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
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index b80c27b..d7bfb00 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -622,7 +622,11 @@
ft.show(mDialpadFragment);
ft.commit();
- mFloatingActionButtonController.scaleOut();
+ if (animate) {
+ mFloatingActionButtonController.scaleOut();
+ } else {
+ mFloatingActionButtonController.setVisible(false);
+ }
mActionBarController.onDialpadUp();
if (!isInSearchUi()) {
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 169b9f3..ee1d634 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1608,8 +1608,8 @@
if (!hidden) {
if (mAnimate) {
dialpadView.animateShow();
- mFloatingActionButtonController.scaleIn(mDialpadSlideInDuration);
}
+ mFloatingActionButtonController.scaleIn(mAnimate ? mDialpadSlideInDuration : 0);
activity.onDialpadShown();
mDigits.requestFocus();
}