diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-05-22 17:18:28 +0800 |
|---|---|---|
| committer | emancebo <emancebo@cyngn.com> | 2014-09-04 15:20:00 -0700 |
| commit | 3a155baaefd6c75b7dc5fab954329952ce3e5054 (patch) | |
| tree | e2b63609ba0b5877d2c82c2931aa897e918119e1 | |
| parent | ab081ce6d29f6ea11e91ecb3a5e7d8750f7481c0 (diff) | |
| download | android_packages_apps_InCallUI-3a155baaefd6c75b7dc5fab954329952ce3e5054.tar.gz android_packages_apps_InCallUI-3a155baaefd6c75b7dc5fab954329952ce3e5054.tar.bz2 android_packages_apps_InCallUI-3a155baaefd6c75b7dc5fab954329952ce3e5054.zip | |
TeleService: Show answer UI and hide manage conference panel for MT CALL
The answer UI is shown, but it is covered by the manage conference
call fragment.
When show the answer UI, hide the manage conference call fragment.
CRs-Fixed: 657336
Conflicts:
src/com/android/incallui/InCallActivity.java
Change-Id: Ifea4e08e7ea7e2d6dd61632b8cc5d2d92aa09df3
| -rw-r--r-- | src/com/android/incallui/AnswerFragment.java | 3 | ||||
| -rw-r--r-- | src/com/android/incallui/InCallActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/incallui/MSimAnswerFragment.java | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/incallui/AnswerFragment.java b/src/com/android/incallui/AnswerFragment.java index 4302920d..93573459 100644 --- a/src/com/android/incallui/AnswerFragment.java +++ b/src/com/android/incallui/AnswerFragment.java @@ -104,6 +104,9 @@ public class AnswerFragment extends BaseFragment<AnswerPresenter, AnswerPresente @Override public void showAnswerUi(boolean show) { + if (show && getActivity() != null && getActivity() instanceof InCallActivity) { + ((InCallActivity) getActivity()).displayManageConferencePanel(false); + } getView().setVisibility(show ? View.VISIBLE : View.GONE); Log.d(this, "Show answer UI: " + show); diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java index d0589181..febe634c 100644 --- a/src/com/android/incallui/InCallActivity.java +++ b/src/com/android/incallui/InCallActivity.java @@ -600,6 +600,8 @@ public class InCallActivity extends Activity { mConferenceManagerFragment.setVisible(true); mConferenceManagerShown = true; updateSystemBarTranslucency(); + } else { + mConferenceManagerFragment.setVisible(false); } } diff --git a/src/com/android/incallui/MSimAnswerFragment.java b/src/com/android/incallui/MSimAnswerFragment.java index 7621f907..e3077e0b 100644 --- a/src/com/android/incallui/MSimAnswerFragment.java +++ b/src/com/android/incallui/MSimAnswerFragment.java @@ -102,6 +102,9 @@ public class MSimAnswerFragment extends BaseFragment<MSimAnswerPresenter, @Override public void showAnswerUi(boolean show) { + if (show && getActivity() != null && getActivity() instanceof MSimInCallActivity) { + ((MSimInCallActivity) getActivity()).displayManageConferencePanel(false); + } getView().setVisibility(show ? View.VISIBLE : View.GONE); Log.d(this, "Show answer UI: " + show); |