summaryrefslogtreecommitdiff
path: root/InCallUI/src/com/android/incallui/InCallActivity.java
diff options
context:
space:
mode:
authorChristine Chen <christinech@google.com>2013-09-05 10:57:05 -0700
committerChristine Chen <christinech@google.com>2013-09-06 11:36:37 -0700
commit5345442d7238c1db00dc8d55a49f7f5dd713d994 (patch)
tree6d436500fa3eb6e91616eabfc27a8d03a51f5a45 /InCallUI/src/com/android/incallui/InCallActivity.java
parent4f5b60270e59c8e7dfb22489361ef83c4630485a (diff)
Adds manage conference call UI
Bug: 10334739 Change-Id: I46a52ec967a1c496dd4b797f2064d9099670711f
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index fee4d9510..6cae6b05e 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -34,6 +34,7 @@ public class InCallActivity extends Activity {
private CallCardFragment mCallCardFragment;
private AnswerFragment mAnswerFragment;
private DialpadFragment mDialpadFragment;
+ private ConferenceManagerFragment mConferenceManagerFragment;
private boolean mIsForegroundActivity;
@Override
@@ -287,6 +288,11 @@ public class InCallActivity extends Activity {
mDialpadFragment.getView().setVisibility(View.INVISIBLE);
}
+ if (mConferenceManagerFragment == null) {
+ mConferenceManagerFragment = (ConferenceManagerFragment) getFragmentManager()
+ .findFragmentById(R.id.conferenceManagerFragment);
+ mConferenceManagerFragment.getView().setVisibility(View.INVISIBLE);
+ }
setUpPresenterCallbacks();
}
@@ -302,6 +308,7 @@ public class InCallActivity extends Activity {
mainPresenter.addListener(mCallButtonFragment.getPresenter());
mainPresenter.addListener(mCallCardFragment.getPresenter());
+ mainPresenter.addListener(mConferenceManagerFragment.getPresenter());
// setting activity should be last thing in setup process
mainPresenter.setActivity(this);
@@ -313,6 +320,7 @@ public class InCallActivity extends Activity {
mainPresenter.removeListener(mCallButtonFragment.getPresenter());
mainPresenter.removeListener(mCallCardFragment.getPresenter());
+ mainPresenter.removeListener(mConferenceManagerFragment.getPresenter());
mainPresenter.setActivity(null);
}
@@ -332,4 +340,14 @@ public class InCallActivity extends Activity {
mCallCardFragment.setVisible(true);
}
}
+
+ public boolean isDialpadVisible() {
+ return mDialpadFragment.isVisible();
+ }
+
+ public void displayManageConferencePanel(boolean showPanel) {
+ if (showPanel) {
+ mConferenceManagerFragment.setVisible(true);
+ }
+ }
}