diff options
author | Steve Kondik <steve@cyngn.com> | 2015-11-16 14:47:40 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-11-16 14:47:40 -0800 |
commit | 412dd31efe837c14f09a56511d93e2a7150cd340 (patch) | |
tree | d23d705334d4f70bc152e55dec4f4331ee6649bc | |
parent | 3cb06ac57579ba579ba4954401a56cf93848d77f (diff) | |
parent | b59d8189fed931d934743357457821579187c281 (diff) | |
download | android_packages_apps_Dialer-412dd31efe837c14f09a56511d93e2a7150cd340.tar.gz android_packages_apps_Dialer-412dd31efe837c14f09a56511d93e2a7150cd340.tar.bz2 android_packages_apps_Dialer-412dd31efe837c14f09a56511d93e2a7150cd340.zip |
Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/packages/apps/Dialer into cm-13.0
Change-Id: I7350711cbc7e909f7dae5a23af8ccf84bbb9d77e
-rw-r--r-- | res/menu/dialpad_options.xml | 4 | ||||
-rw-r--r-- | res/menu/dialtacts_options.xml | 3 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 6 | ||||
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 12 |
5 files changed, 25 insertions, 2 deletions
diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml index 63fca07da..00c0f1e18 100644 --- a/res/menu/dialpad_options.xml +++ b/res/menu/dialpad_options.xml @@ -16,6 +16,10 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/menu_add_to_4g_conference_call" + android:title="@string/menu_add_to_4g_conference_call" + android:showAsAction="withText" /> + <item android:id="@+id/menu_2s_pause" android:title="@string/add_2sec_pause" android:showAsAction="withText" /> diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml index 8a9e25f7f..768848ba9 100644 --- a/res/menu/dialtacts_options.xml +++ b/res/menu/dialtacts_options.xml @@ -16,6 +16,9 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/menu_4g_conference_call" + android:title="@string/menu_4g_conference_call" /> + <item android:id="@+id/menu_history" android:icon="@drawable/ic_menu_history_lt" android:title="@string/action_menu_call_history_description" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 5e2476db0..4217fa7a2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -266,6 +266,8 @@ <string name="menu_show_all_calls">Show all calls</string> <!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] --> + <string name="menu_add_to_4g_conference_call">Add to 4G conference call</string> + <string name="menu_4g_conference_call">4G conference call</string> <string name="add_2sec_pause">Add 2-sec pause</string> <string name="add_wait">Add wait</string> 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; } |