commit a43971a296924bc9eae99aab063ec742808e7bb8
author Devci Telephony <devci-telephony@localhost> Tue Dec 27 05:30:13 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Dec 27 05:30:13 2016 -0800
tree 70fcfbdf6ff4f3e7a7db4fa157588e0e3fe53541
parent 7611fcfbf6bd8e32abf2ac713855837723b510bc
parent 76ed8c359bcbb4eb7a955eec31192592dbe0f67f

Merge "IMS-VT: Send static image in a Video Call" into atel.lnx.2.0-dev

src/com/android/dialer/dialpad/DialpadFragment.java

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 85be754..b77d6f3 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1594,6 +1594,7 @@
 
             mFloatingActionButtonController.setVisible(true);
             mDialpadChooser.setVisibility(View.GONE);
+            mFloatingActionButtonController.scaleIn(mAnimate ? mDialpadSlideInDuration : 0);
         }
     }