diff options
| -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 | 5 | ||||
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 8 |
5 files changed, 22 insertions, 0 deletions
diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml index 211d9cfdd..ab317676e 100644 --- a/res/menu/dialpad_options.xml +++ b/res/menu/dialpad_options.xml @@ -19,6 +19,10 @@ android:title="@string/video_call" android:showAsAction="withText" /> <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_ip_call_by_slot1" android:showAsAction="withText" /> <item diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml index cc5e3868e..b714b689d 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 d03818f68..41dccf906 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -355,6 +355,8 @@ <!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] --> <string name="video_call">Video call</string> + <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_contact">Add to contacts</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 ad6cc5a9c..703799d8d 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -245,6 +245,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O clearFrequents.setVisible(mListsFragment != null && mListsFragment.getSpeedDialFragment() != null && mListsFragment.getSpeedDialFragment().hasFrequents()); + final MenuItem ConferDialerOption = menu.findItem(R.id.menu_4g_conference_call); + ConferDialerOption.setVisible(CallUtil.isConferDialerEnabled()); super.show(); } } @@ -594,6 +596,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: showCallHistory(); break; diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index e20f6c9de..46a02b512 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -939,6 +939,10 @@ public class DialpadFragment extends AnalyticsFragment final MenuItem VideoCallOption = menu.findItem(R.id.menu_video_call); VideoCallOption.setVisible(CallUtil.isCSVTEnabled()); + final MenuItem ConferDialerOption + = menu.findItem(R.id.menu_add_to_4g_conference_call); + ConferDialerOption.setVisible(CallUtil.isConferDialerEnabled()); + boolean enable = !isDigitsEmpty(); for (int i = 0; i < menu.size(); i++) { menu.getItem(i).setEnabled(enable); @@ -1704,6 +1708,10 @@ public class DialpadFragment extends AnalyticsFragment } else if (false) { //add support for ims video call; } + case R.id.menu_add_to_4g_conference_call: + getActivity().startActivity(CallUtil.getConferenceDialerIntent( + mDigits.getText().toString())); + return true; default: return false; } |