diff --git a/InCallUI/res/anim/incall_dialpad_slide_in.xml b/InCallUI/res/anim/incall_dialpad_slide_in.xml
index 89f4552..0e8ffce 100644
--- a/InCallUI/res/anim/incall_dialpad_slide_in.xml
+++ b/InCallUI/res/anim/incall_dialpad_slide_in.xml
@@ -13,11 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<objectAnimator
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/fast_out_slow_in"
     android:valueFrom="1.0"
     android:valueTo="0"
     android:valueType="floatType"
     android:propertyName="yFraction"
-    android:duration="200" />
\ No newline at end of file
+    android:duration="666" />
\ No newline at end of file
diff --git a/InCallUI/res/anim/incall_dialpad_slide_out.xml b/InCallUI/res/anim/incall_dialpad_slide_out.xml
index 7fa03a2..313e0b2 100644
--- a/InCallUI/res/anim/incall_dialpad_slide_out.xml
+++ b/InCallUI/res/anim/incall_dialpad_slide_out.xml
@@ -13,11 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<objectAnimator
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/fast_out_slow_in"
     android:valueFrom="0"
     android:valueTo="1.0"
     android:valueType="floatType"
     android:propertyName="yFraction"
-    android:duration="200" />
\ No newline at end of file
+    android:duration="426" />
\ No newline at end of file
diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index d22b903..df1681c 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -490,6 +490,17 @@
     }
 
     @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        final DialpadView dialpadView = (DialpadView) getView().findViewById(R.id.dialpad_view);
+        if (hidden) {
+            dialpadView.animateHide();
+        } else {
+            dialpadView.animateShow();
+        }
+    }
+
+    @Override
     public void appendDigitsToField(char digit) {
         if (mDtmfDialerField != null) {
             // TODO: maybe *don't* manually append this digit if