Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev

Browse Source 
automerge: 8b438c8

* commit '8b438c8c1abc3e5e5cce2c9ee22f64c9a5a30290':
  Add strings for IMS Registration error notifications.
This commit is contained in:
Pavel Zhamaitsiak
2015-03-10 19:34:02 +00:00
committed by android-build-merger
parent 93e314e82d 8b438c8c1a
commit 4a2ca9da48
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/res/res/values-mcc310-mnc260/strings.xml Normal file
View File

@@ -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\&apos;t available. Contact your carrier to enable Wi-Fi Calling.</item>
</string-array>
</resources>

6
core/res/res/values/strings.xml
View File

@@ -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*"

3
core/res/res/values/symbols.xml
View File

@@ -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" />