summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorZhao Fan <zhaof@codeaurora.org>2016-05-05 23:58:06 +0800
committerLinux Build Service Account <lnxbuild@localhost>2016-08-24 08:18:19 -0600
commitde5e75469e22597c0aa861d5beca4fce7499350b (patch)
treee50725d5730fe8c7b1dad6e81f9f47984c39ed70 /res/values
parent160c0416a023e9bf8fae10567d055aabd29b276f (diff)
downloadandroid_packages_apps_Dialer-de5e75469e22597c0aa861d5beca4fce7499350b.tar.gz
android_packages_apps_Dialer-de5e75469e22597c0aa861d5beca4fce7499350b.tar.bz2
android_packages_apps_Dialer-de5e75469e22597c0aa861d5beca4fce7499350b.zip
One-key 4G conference and add multi-participants support
IMS: Add APIs to get intent for conference dialer 1) Add config to control the conference dialer by MCC/MNC. 3) Start confer dialer to originate a conference call. 4) Start confer dialer to add participants for the existing conference call. 5) Show 4G conference call option only if IMS is registered. Change-Id: Ieb89e43dbd0cec13c89af332d7923d181d92b23a IMS: Show conference participant state 1) Add config to control the conference state display. 2) Show conference participant state according to the config value. 3) Add more states for conference call. Change-Id: I75919d0538d2990c161a393d47ceacaf7cbcf805 IMS: Implement adding multi-participants to an exsiting conference call 1) Add a config value to enable or disable of adding multi-participants to conference call. 2) Format intent with current participants to start ConfernceDialer. 3) Config to add participant only in conferencall call for CMCC. 4) Format participants' numbers before sending add multi participants intent to ConferenceCallActivity. Change-Id: Ibcbfd2b26801686de2abb6f2940c97487b20b424 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 CRs-Fixed: 934253
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ba3d65dd4..68dd5c6d9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,6 +314,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>