am cffac94..b7cdece from mirror-m-wireless-internal-release
b7cdece Remove "IMS Account" preference under call settings.
Change-Id: I1ab86d5a797b59840958a20852a87c546bdbcfec
diff --git a/res/values/array.xml b/res/values/array.xml
deleted file mode 100644
index 79b6034..0000000
--- a/res/values/array.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Array resources for the Phone app. -->
-<resources>
- <!-- Array resource for IMS VT call quality entries-->
- <string-array translatable="true" name="ims_vt_call_quality_entries">
- <item>@string/ims_vt_call_quality_low</item>
- <item>@string/ims_vt_call_quality_high</item>
- </string-array>
-
- <!-- Array resource for IMS VT call quality values-->
- <string-array translatable="false" name="ims_vt_call_quality_values">
- <item>0</item>
- <item>1</item>
- </string-array>
-</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index b7e3208..1f32b2d 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -156,4 +156,7 @@
<!-- Determine whether the voicemail notification is persistent in the notification bar.
If true, the voicemail notifications cannot be dismissed from the notification bar. -->
<bool name="voicemail_notification_persistent">false</bool>
+
+ <!-- For IMS video over LTE calls, determines whether video pause signalling is supported. -->
+ <bool name="support_pause_ims_video_calls" translatable="false">true</bool>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 408d570..3a101bf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -184,7 +184,7 @@
<!-- GSM Call settings screen, setting option name -->
<string name="additional_gsm_call_settings">Additional settings</string>
<!-- GSM Call settings screen, setting option name, with label identifying the SIM the settings are for. -->
- <string name="additional_gsm_call_settings_with_label">Additional settings (<xliff:g id="subscriptionlabel" example="Mock Carrier">%s</xliff:g>)</string>
+ <string name="additional_gsm_call_settings_with_label">Additional settings (<xliff:g id="subscriptionlabel" example="Verizon">%s</xliff:g>)</string>
<!-- GSM-only Call settings screen, setting option name-->
<string name="sum_gsm_call_settings">Additional GSM only call settings</string>
<!-- CDMA Call settings screen, setting option name -->
@@ -212,7 +212,7 @@
<!-- Call forwarding settings screen, section heading -->
<string name="call_forwarding_settings">Call forwarding settings</string>
<!-- Call forwarding settings screen, section heading, with a label identifying the SIM the settings are for. -->
- <string name="call_forwarding_settings_with_label">Call forwarding settings (<xliff:g id="subscriptionlabel" example="Mock Carrier">%s</xliff:g>)</string>
+ <string name="call_forwarding_settings_with_label">Call forwarding settings (<xliff:g id="subscriptionlabel" example="Verizon">%s</xliff:g>)</string>
<!-- Call settings screen, setting option name -->
<string name="labelCF">Call forwarding</string>
@@ -257,9 +257,8 @@
<string name="messageCFNRc">Number when unreachable</string>
<!-- Call forwarding settings screen, setting summary text when forwarding to a specific number when unreachable-->
<string name="sum_cfnrc_enabled">Forwarding to <xliff:g id="phonenumber" example="555-1212">{0}</xliff:g></string>
- <!-- Call forwarding settings screen, setting summary text when "Forward when unreachable" is
- disabled. [CHAR LIMIT=40] -->
- <string name="sum_cfnrc_disabled">Off</string>
+ <!-- Call forwarding settings screen, setting summary text when Forward when unreachable is disabled -->
+ <string name="sum_cfnrc_disabled">Disabled</string>
<!-- Error message displayed after failing to disable forwarding calls when the phone is unreachable -->
<string name="disable_cfnrc_forbidden">Your carrier doesn\'t support disabling call forwarding when your phone is unreachable.</string>
@@ -268,7 +267,7 @@
<!-- Toast in Call settings when asked to launch settings for a secondary user -->
<string name="call_settings_primary_user_only">Call settings can only be changed by the primary user.</string>
<!-- Title of the "Call settings" settings screen, with a text label identifying which SIM the settings are for. -->
- <string name="call_settings_with_label">Call settings (<xliff:g id="subscriptionlabel" example="Mock Carrier">%s</xliff:g>)</string>
+ <string name="call_settings_with_label">Call settings (<xliff:g id="subscriptionlabel" example="Verizon">%s</xliff:g>)</string>
<!-- Title of the alert dialog displayed if an error occurs while updating Call settings -->
<string name="error_updating_title">Call settings error</string>
<!-- Toast in Call settings dialog while settings are being read -->
@@ -722,13 +721,13 @@
<string name="fdn">Fixed Dialing Numbers</string>
<!-- Title for "Fixed Dialing Number" settings, with a label to identify the SIM the settings
apply to. -->
- <string name="fdn_with_label">Fixed Dialing Numbers (<xliff:g id="subscriptionlabel" example="Mock Carrier">%s</xliff:g>)</string>
+ <string name="fdn_with_label">Fixed Dialing Numbers (<xliff:g id="subscriptionlabel" example="Verizon">%s</xliff:g>)</string>
<!-- Call settings screen, button label that takes you to the Fixed Dialing Number management screen -->
<string name="manage_fdn_list">FDN list</string>
<!-- Title for settings screen to manage Fixed Dialing Number contacts, with a label to identify
the SIM the settings apply to. -->
- <string name="fdn_list_with_label">FDN list (<xliff:g id="subscriptionlabel" example="Mock Carrier">%s</xliff:g>)</string>
+ <string name="fdn_list_with_label">FDN list (<xliff:g id="subscriptionlabel" example="Verizon">%s</xliff:g>)</string>
<!-- Call settings screen, preference item label -->
<string name="fdn_activation">FDN activation</string>
<!-- Call settings setting option name when FDN is enabled -->
@@ -1077,6 +1076,22 @@
<item>3</item>
</string-array>
+ <!-- Dtmf tones settings -->
+ <!-- Title for the DTMF Tones options displayed in Call Settings -->
+ <string name="dtmf_tones_title">DTMF tones</string>
+ <!-- Summary for the DTMF Tones options displayed in Call Settings -->
+ <string name="dtmf_tones_summary">Set the length of DTMF tones</string>
+ <!-- Options displayed as part of DTMF Tones in Call Settings -->
+ <string-array name="dtmf_tone_entries">
+ <item>Normal</item>
+ <item>Long</item>
+ </string-array>
+ <!-- Do not translate. -->
+ <string-array name="dtmf_tone_values" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ </string-array>
+
<!-- Title for the dialog used to display CDMA DisplayInfo -->
<string name="network_info_message">Network message</string>
<!-- Title for the dialog used to display a network error message to the user -->