commit e8c8389ce36a4eb10e039ffe86f8b699813ca7e3
author calderwoodra <calderwoodra@google.com> Mon Oct 16 11:12:27 2017 -0700
committer Eric Erfanian <erfanian@google.com> Mon Oct 16 14:18:30 2017 -0700
tree fa33c030979f1c99e8e85aad90c2a774a477be77
parent bfd6b1f516de89933d7fb973e6f909a22007ff8a

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

diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java
index c4e6c61..2316e86 100644
--- a/java/com/android/dialer/dialpadview/DialpadFragment.java
+++ b/java/com/android/dialer/dialpadview/DialpadFragment.java
@@ -1430,19 +1430,21 @@
     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();
     }
   }