From daba64924bbea8a0eb49723d69c1178a7c2ef0f2 Mon Sep 17 00:00:00 2001 From: Suchand Ghosh Date: Tue, 15 Sep 2015 11:03:51 +0530 Subject: IMS: Fix empty URI list dial after add participant. Consider add participant when phone is in use and in such case don't allow add participant with empty uri list. If phone is idle then don't treat dial request as add participant. Rather allow dial with empty URI list using conf uri dialer. Change-Id: Ibefd3289155ba23a17c234a061b0a5136fbdf718 CRs-Fixed: 903527 --- src/com/android/dialer/dialpad/DialpadFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/com') diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index d65e2ebfe..83567f17a 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -1218,8 +1218,8 @@ public class DialpadFragment extends Fragment mRecipients.getText().toString().trim(); if (isDigitsShown && isDigitsEmpty()) { handleDialButtonClickWithEmptyDigits(); - } else if (mAddParticipant && isDigitsEmpty() && mRecipients.isShown() - && isRecipientEmpty()) { + } else if (mAddParticipant && isPhoneInUse() && isDigitsEmpty() + && mRecipients.isShown() && isRecipientEmpty()) { // mRecipients must be empty // TODO add support for conference URI in last number dialed // use ErrorDialogFragment instead? also see -- cgit v1.2.3 From 76c9726e48ccbbcb5780ab076b7c54aadcdc621b Mon Sep 17 00:00:00 2001 From: cdu Date: Fri, 24 Oct 2014 22:33:37 +0800 Subject: IMS: Enable entry 4G conference call in Dialer 1) Start conference call in dialtact 2) Start conference call in dialpad with numbers 3) Show 4G conference call option only if IMS is registered Change-Id: I9f9c379e26b904f7749a72241e51cc6660f98d53 --- src/com/android/dialer/DialtactsActivity.java | 6 ++++++ src/com/android/dialer/dialpad/DialpadFragment.java | 8 ++++++++ 2 files changed, 14 insertions(+) (limited to 'src/com') diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index abd7c8c83..e90f7ec6f 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -57,6 +57,7 @@ import android.widget.ImageButton; import android.widget.PopupMenu; import android.widget.Toast; +import com.android.contacts.common.CallUtil; import com.android.contacts.common.activity.TransactionSafeActivity; import com.android.contacts.common.dialog.ClearFrequentsDialog; import com.android.contacts.common.interactions.ImportExportDialogFragment; @@ -271,6 +272,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O menu.findItem(R.id.menu_history).setVisible( PermissionsUtil.hasPhonePermissions(DialtactsActivity.this)); + final MenuItem ConferDialerOption = menu.findItem(R.id.menu_4g_conference_call); + ConferDialerOption.setVisible(CallUtil.isConferDialerEnabled(getApplicationContext())); super.show(); } } @@ -674,6 +677,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O @Override public boolean onMenuItemClick(MenuItem item) { switch (item.getItemId()) { + case R.id.menu_4g_conference_call: + this.startActivity(CallUtil.getConferenceDialerIntent(null)); + break; case R.id.menu_history: // Use explicit CallLogActivity intent instead of ACTION_VIEW + // CONTENT_TYPE, so that we always open our call log from our dialer diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index d65e2ebfe..e22a07bf6 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -935,6 +935,10 @@ public class DialpadFragment extends Fragment public void show() { final Menu menu = getMenu(); + final MenuItem ConferDialerOption + = menu.findItem(R.id.menu_add_to_4g_conference_call); + ConferDialerOption.setVisible(CallUtil.isConferDialerEnabled(getActivity())); + boolean enable = !isDigitsEmpty(); for (int i = 0; i < menu.size(); i++) { menu.getItem(i).setEnabled(enable); @@ -1602,6 +1606,10 @@ public class DialpadFragment extends Fragment case R.id.menu_add_wait: updateDialString(WAIT); return true; + case R.id.menu_add_to_4g_conference_call: + getActivity().startActivity(CallUtil.getConferenceDialerIntent( + mDigits.getText().toString())); + return true; default: return false; } -- cgit v1.2.3