summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSai Cheemalapati <saicheems@google.com>2014-06-11 10:27:33 -0700
committerSai Cheemalapati <saicheems@google.com>2014-06-11 19:01:01 +0000
commit06c7da3a55a2e06696a0dac8490f6dc84e8ff94e (patch)
tree68c41ac01022a873380abfaf70768f1a66f37fea
parentbef3d3a1b287fdb3c94fbe81c7eee2b73c5713a0 (diff)
Fix key slide up animation on rotation in InCallUI.
Slide up animation no longer occurs after rotation when dialpad is already revealed. Change-Id: I5e75bae5df291dcd15ad2c3e346157f03a404e11
-rw-r--r--InCallUI/src/com/android/incallui/DialpadFragment.java13
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java1
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);
}