summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorcdu <cdu@codeaurora.org>2014-10-24 22:33:37 +0800
committerZhao Fan <zhaof@codeaurora.org>2015-10-30 21:07:11 +0800
commit76c9726e48ccbbcb5780ab076b7c54aadcdc621b (patch)
tree336166a685b45aad04652fec5bdb9970de138d1d /res
parent2fec8e35dabf931fc349f7d594c5560fbf35bcc5 (diff)
downloadpackages_apps_Dialer-76c9726e48ccbbcb5780ab076b7c54aadcdc621b.tar.gz
packages_apps_Dialer-76c9726e48ccbbcb5780ab076b7c54aadcdc621b.tar.bz2
packages_apps_Dialer-76c9726e48ccbbcb5780ab076b7c54aadcdc621b.zip
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
Diffstat (limited to 'res')
-rw-r--r--res/menu/dialpad_options.xml4
-rw-r--r--res/menu/dialtacts_options.xml3
-rw-r--r--res/values/strings.xml2
3 files changed, 9 insertions, 0 deletions
diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml
index f0399a82b..fad1c7ff6 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>