Merge "Fix key slide up animation on rotation in InCallUI."

2 files changed, 7 insertions, 7 deletions

diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index 8d8703bed..2674e23b5 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -485,13 +485,12 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
         }
     }
 
-    @Override
-    public void onHiddenChanged(boolean hidden) {
-        super.onHiddenChanged(hidden);
-        if (!hidden) {
-            final DialpadView dialpadView = (DialpadView) getView().findViewById(R.id.dialpad_view);
-            dialpadView.animateShow();
-        }
+    /**
+     * Starts the slide up animation for the Dialpad keys when the Dialpad is revealed.
+     */
+    public void animateShowDialpad() {
+        final DialpadView dialpadView = (DialpadView) getView().findViewById(R.id.dialpad_view);
+        dialpadView.animateShow();
     }
 
     @Override
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index f6e485b4c..a4705a000 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -476,6 +476,7 @@ public class InCallActivity extends Activity {
         } else {
             if (showDialpad) {
                 showDialpad(true);
+                mDialpadFragment.animateShowDialpad();
             }
             mDialpadFragment.getView().startAnimation(showDialpad ? mSlideIn : mSlideOut);
         }