diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2015-03-10 19:34:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-03-10 19:34:02 +0000 |
| commit | 4a2ca9da48e177b3cf191a435bd62a7e6b706d3e (patch) | |
| tree | c34a11b76db312cef9c2aa8df7e6c9a399a074e0 /core | |
| parent | 93e314e82d2c55e1bdc93f65a2750026c2fccae9 (diff) | |
| parent | 8b438c8c1abc3e5e5cce2c9ee22f64c9a5a30290 (diff) | |
| download | frameworks_base-4a2ca9da48e177b3cf191a435bd62a7e6b706d3e.zip frameworks_base-4a2ca9da48e177b3cf191a435bd62a7e6b706d3e.tar.gz frameworks_base-4a2ca9da48e177b3cf191a435bd62a7e6b706d3e.tar.bz2 | |
Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
automerge: 8b438c8
* commit '8b438c8c1abc3e5e5cce2c9ee22f64c9a5a30290':
Add strings for IMS Registration error notifications.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values-mcc310-mnc260/strings.xml | 32 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 6 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 3 |
3 files changed, 41 insertions, 0 deletions
diff --git a/core/res/res/values-mcc310-mnc260/strings.xml b/core/res/res/values-mcc310-mnc260/strings.xml new file mode 100644 index 0000000..5cadc2a --- /dev/null +++ b/core/res/res/values-mcc310-mnc260/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 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 my 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. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- WFC Operator Error Codes --> + <string-array name="wfcOperatorErrorCodes" translatable="false"> + <item>REG09</item> + </string-array> + <!-- WFC Operator Error Messages --> + <string-array name="wfcOperatorErrorMessages"> + <item>Wi-Fi Calling isn\'t available. Contact your carrier to enable Wi-Fi Calling.</item> + </string-array> +</resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index c849d2c..7633950 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -245,6 +245,12 @@ <string name="roamingText12">Roaming Banner Off</string> <string name="roamingTextSearching">Searching for Service</string> + <!-- Displayed when WFC registration fails --> + <string name="wfcRegErrorTitle">Wi-Fi Calling</string> + <!-- WFC Operator Error Codes --> + <string-array name="wfcOperatorErrorCodes" translatable="false" /> + <!-- WFC Operator Error Messages --> + <string-array name="wfcOperatorErrorMessages" /> <!-- {0} is one of "bearerServiceCode*" diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 747c054..b417968 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -745,6 +745,9 @@ <java-symbol type="string" name="phoneTypeWork" /> <java-symbol type="string" name="phoneTypeWorkMobile" /> <java-symbol type="string" name="phoneTypeWorkPager" /> + <java-symbol type="string" name="wfcRegErrorTitle" /> + <java-symbol type="array" name="wfcOperatorErrorCodes" /> + <java-symbol type="array" name="wfcOperatorErrorMessages" /> <java-symbol type="string" name="policydesc_disableCamera" /> <java-symbol type="string" name="policydesc_encryptedStorage" /> <java-symbol type="string" name="policydesc_expirePassword" /> |