summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-02-27 17:30:20 -0800
committerYorke Lee <yorkelee@google.com>2015-02-27 17:32:00 -0800
commitac3d2f0549f5f5d7789d92ff8d2f818315af0ad0 (patch)
tree712e4508c498a7c5e4af059d4d03b8eb5e6047f2
parentcb857b2eda1ce501975b64e979b6f529253e1665 (diff)
Don't hide dialpad when disconnecting
This was originally needed because the dialpad was full screen and would obscure the call status when ending the call. This is no longer true with the L dialer and the dialpad sliding animation when the call is ended looks weird. Change-Id: Id78c2bef3470066b9e8e86bce0c6f431df5adde2
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java8
-rw-r--r--InCallUI/src/com/android/incallui/InCallPresenter.java10
2 files changed, 0 insertions, 18 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index f75c33b23..e2ffe73b7 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -606,14 +606,6 @@ public class InCallActivity extends Activity {
}
}
- /**
- * Simulates a user click to hide the dialpad. This will update the UI to show the call card,
- * update the checked state of the dialpad button, and update the proximity sensor state.
- */
- public void hideDialpadForDisconnect() {
- mCallButtonFragment.displayDialpad(false /* show */, true /* animate */);
- }
-
public void dismissKeyguard(boolean dismiss) {
if (mDismissKeyguard == dismiss) {
return;
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index ce6d439d1..327f4cef2 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -443,7 +443,6 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
*/
@Override
public void onDisconnect(Call call) {
- hideDialpadForDisconnect();
maybeShowErrorDialogOnDisconnect(call);
// We need to do the run the same code as onCallListChange.
@@ -864,15 +863,6 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
}
/**
- * Hides the dialpad. Called when a call is disconnected (Requires hiding dialpad).
- */
- private void hideDialpadForDisconnect() {
- if (isActivityStarted()) {
- mInCallActivity.hideDialpadForDisconnect();
- }
- }
-
- /**
* When the state of in-call changes, this is the first method to get called. It determines if
* the UI needs to be started or finished depending on the new state and does it.
*/