summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorcdu <cdu@codeaurora.org>2014-10-24 22:33:37 +0800
committercdu <cdu@codeaurora.org>2014-11-06 15:52:11 +0800
commit2d08db86edf39d7b2431418408d919fbcca43780 (patch)
treededfdd9c7592cbc6ea2a551b159c8f90ff04e307 /res
parent6daa87361da8876d9de116648330d71b6431cbe8 (diff)
downloadandroid_packages_apps_Dialer-2d08db86edf39d7b2431418408d919fbcca43780.tar.gz
android_packages_apps_Dialer-2d08db86edf39d7b2431418408d919fbcca43780.tar.bz2
android_packages_apps_Dialer-2d08db86edf39d7b2431418408d919fbcca43780.zip
IMS: Enable entry 4G conference call in Dialer.
1) start conference call in dialtact 2) start conference call in dialpad with numbers 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 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>