diff options
author | Andrew Lee <anwlee@google.com> | 2015-06-22 17:46:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-22 17:46:14 +0000 |
commit | 8f25a4d230989a184aa64c80330503d3fabe8490 (patch) | |
tree | a95c885741ebd0d8b8b1a8a4386d2a94e319967f /src | |
parent | f3ec8ad515ec344acd53fa4acaa9df4cad0c2306 (diff) | |
parent | 200bb14d08e8162e893eec2ca928491d75eab8e0 (diff) |
Merge "Set FAB to invisible on hide if no animation." into mnc-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 766175c9b..5b1e21129 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -1643,12 +1643,17 @@ public class DialpadFragment extends Fragment 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); + } } } |