From e8c8389ce36a4eb10e039ffe86f8b699813ca7e3 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Mon, 16 Oct 2017 11:12:27 -0700 Subject: FAB is no longer visible on return to call dialog. Bug: 67419607 Test: manual PiperOrigin-RevId: 172349180 Change-Id: I305f8a0e5ae90b2e5e8f77772edfb0b973aca096 --- java/com/android/dialer/dialpadview/DialpadFragment.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'java/com/android/dialer/dialpadview/DialpadFragment.java') 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(); } } -- cgit v1.2.3