diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-09-18 17:02:43 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2013-09-18 17:02:43 -0700 |
| commit | ba7188997ad35d48247b8e9d93151a2d714712ca (patch) | |
| tree | 40f00e10aa277887c92f1e78341a0f97d6a4147b /InCallUI/src/com/android/incallui/InCallActivity.java | |
| parent | c45651f66d67ad0ff33c302ae2c350bfdd4fe7d1 (diff) | |
Make back button exit ConferenceManagerFragment
Bug: 10808785
Change-Id: I8acf38bfa06bb58a778c45b107ff49eead37f25b
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index feb3ec137..391a7809d 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -180,6 +180,9 @@ public class InCallActivity extends Activity { if (mDialpadFragment.isVisible()) { mCallButtonFragment.displayDialpad(false); // do the "closing" animation return; + } else if (mConferenceManagerFragment.isVisible()) { + mConferenceManagerFragment.setVisible(false); + return; } // Nothing special to do. Fall back to the default behavior. |