From ba7188997ad35d48247b8e9d93151a2d714712ca Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Wed, 18 Sep 2013 17:02:43 -0700
Subject: Make back button exit ConferenceManagerFragment

Bug: 10808785
Change-Id: I8acf38bfa06bb58a778c45b107ff49eead37f25b
---
 InCallUI/src/com/android/incallui/InCallActivity.java | 3 +++
 1 file changed, 3 insertions(+)

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.
-- 
cgit v1.2.3