summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-03-02 23:43:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-02 23:43:37 +0000
commit8bf9040cfb63181c3655b3cb111a342058037d6f (patch)
treebde3d5818f219caeedad19e3163ec3ebf3111f4e
parent90c3d80090f981e96b863e1282df87465e5dd2fc (diff)
parentac3d2f0549f5f5d7789d92ff8d2f818315af0ad0 (diff)
Merge "Don't hide dialpad when disconnecting"
-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 32bee93a7..6c582131b 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -583,14 +583,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 721196793..318d8695e 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -442,7 +442,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.
@@ -863,15 +862,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.
*/