diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-16 23:06:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-16 23:06:02 +0000 |
commit | 5a6cb962ae30ad9e308b5bcc00920daf84618808 (patch) | |
tree | 37a4eaebaa8922b4b4731861884027290d85e741 /java/com/android/dialer/dialpadview/DialpadFragment.java | |
parent | 6c40b97de12b596aca419da815868e553ad9a631 (diff) | |
parent | e8d7752e920b6f31874a770c9ddcbbaaee0627cb (diff) |
Merge changes Iab543850,I305f8a0e
* changes:
Keep promo state on rotate
FAB is no longer visible on return to call dialog.
Diffstat (limited to 'java/com/android/dialer/dialpadview/DialpadFragment.java')
-rw-r--r-- | java/com/android/dialer/dialpadview/DialpadFragment.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java index c4e6c61d8..2316e86d2 100644 --- a/java/com/android/dialer/dialpadview/DialpadFragment.java +++ b/java/com/android/dialer/dialpadview/DialpadFragment.java @@ -1430,19 +1430,21 @@ public class DialpadFragment extends Fragment if (getActivity() == null || getView() == null) { return; } - final DialpadView dialpadView = getView().findViewById(R.id.dialpad_view); if (!hidden && !isDialpadChooserVisible()) { if (mAnimate) { - dialpadView.animateShow(); + mDialpadView.animateShow(); } ThreadUtil.getUiThreadHandler() .postDelayed( - () -> mFloatingActionButtonController.scaleIn(), + () -> { + if (!isDialpadChooserVisible()) { + mFloatingActionButtonController.scaleIn(); + } + }, mAnimate ? mDialpadSlideInDuration : 0); FragmentUtils.getParentUnsafe(this, DialpadListener.class).onDialpadShown(); mDigits.requestFocus(); - } - if (hidden) { + } else if (hidden) { mFloatingActionButtonController.scaleOut(); } } |