diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-09-26 21:43:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-26 21:43:57 +0000 |
| commit | 127bec117b65042a5c61b4dcb63837d9ec42243e (patch) | |
| tree | a4f1f159a7d28eb6fd2e37606b78f0bd12bca03a | |
| parent | ff1ca1369f3d9469bd770903dcc2b23edb727973 (diff) | |
| parent | 27b776cad2792368ddc2e61caba0be26352bc807 (diff) | |
Merge "Show call ended if call disconnects while dialpad is showing" into klp-dev
| -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. |