diff options
author | Sai Cheemalapati <saicheems@google.com> | 2014-06-11 20:14:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-11 08:41:11 +0000 |
commit | 890983704b65f09555efccb5c18b46ec2249b765 (patch) | |
tree | 79eb7a1ca4d1f98cb1734d463b6743ae19cb4bbc /InCallUI | |
parent | 8ee877c14511973e5988b23311277986dc2461e5 (diff) | |
parent | 06c7da3a55a2e06696a0dac8490f6dc84e8ff94e (diff) |
Merge "Fix key slide up animation on rotation in InCallUI."
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/DialpadFragment.java | 13 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 1 |
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); } |