diff options
author | Yorke Lee <yorkelee@google.com> | 2013-09-30 16:42:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-30 16:42:11 -0700 |
commit | 44881626eba768ba9e239a607b05fc367c0a8a76 (patch) | |
tree | 09ce4dddd5a96ec591307f1ed69185df000b91f9 /InCallUI | |
parent | 2e3eb7c90b6e17217e1289adeffb04e4218740eb (diff) | |
parent | 127bec117b65042a5c61b4dcb63837d9ec42243e (diff) |
am 6e4add8b: Merge "Show call ended if call disconnects while dialpad is showing" into klp-dev
* commit '6e4add8bc2bc7475b9c597c85286b27542929f69':
Show call ended if call disconnects while dialpad is showing
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 8 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 1 |
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. |