diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-09-19 00:09:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-19 00:09:52 +0000 |
| commit | 82d64da6612291b8a73db8e452c0b3a1c26abf92 (patch) | |
| tree | 7d3445577d8e3bc2153eedcc9c4798a22ce808f6 | |
| parent | 715422b7fbfde59981a7e8421c86be14ad88f786 (diff) | |
| parent | ba7188997ad35d48247b8e9d93151a2d714712ca (diff) | |
Merge "Make back button exit ConferenceManagerFragment" into klp-dev
| -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 f4ddf62d0..15e48c54a 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. |