Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/packages/apps/Dialer into cm-13.0

Change-Id: I7350711cbc7e909f7dae5a23af8ccf84bbb9d77e

2 files changed, 16 insertions, 2 deletions

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 31a3feb30..d406837cc 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -923,6 +923,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++) {
                     MenuItem item = menu.getItem(i);
@@ -1209,8 +1213,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
@@ -1597,6 +1601,10 @@ public class DialpadFragment extends Fragment
                 CallSubjectDialog.start(getActivity(), mDigits.getText().toString());
                 hideAndClearDialpad(false);
                 return true;
+            case R.id.menu_add_to_4g_conference_call:
+                getActivity().startActivity(CallUtil.getConferenceDialerIntent(
+                        mDigits.getText().toString()));
+                return true;
             default:
                 return false;
         }