diff options
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 6 | ||||
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index b80c27bd4..d7bfb00fb 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -622,7 +622,11 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 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 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(); } |