summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-09-26 08:23:52 -0700
committerYorke Lee <yorkelee@google.com>2013-09-26 08:23:52 -0700
commit27b776cad2792368ddc2e61caba0be26352bc807 (patch)
tree3876294325089986d470bed332ded7c12dcac1cd
parent5bd7192b2208f2db47af9982469e55440d015c32 (diff)
Show call ended if call disconnects while dialpad is showing
Bug: 10899209 Change-Id: Iefdef1890f8968fda57eb5f3286b97228906b596
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java8
-rw-r--r--InCallUI/src/com/android/incallui/InCallPresenter.java1
2 files changed, 9 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 08766d2c6..32d1f5538 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -370,6 +370,14 @@ public class InCallActivity extends Activity {
toast.show();
}
+ /**
+ * 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);
+ }
+
public void displayDialpad(boolean showDialpad) {
if (showDialpad) {
mDialpadFragment.setVisible(true);
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 499dea0a1..541661c57 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -246,6 +246,7 @@ public class InCallPresenter implements CallList.Listener {
*/
@Override
public void onDisconnect(Call call) {
+ mInCallActivity.hideDialpadForDisconnect();
maybeShowErrorDialogOnDisconnect(call);
// We need to do the run the same code as onCallListChange.