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

Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev

Browse Source
This commit is contained in:
Pavel Zhamaitsiak
2015-03-17 18:28:34 +00:00
committed by Android (Google) Code Review
parent 579535acfa e4fac93dc0
commit 1d33a37e05
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values-mcc310-mnc260/strings.xml
View File

@@ -29,4 +29,6 @@
<string-array name="wfcOperatorErrorMessages"> <string-array name="wfcOperatorErrorMessages">
<item>Wi-Fi Calling isn\&apos;t available. Contact your carrier to enable Wi-Fi Calling.</item> <item>Wi-Fi Calling isn\&apos;t available. Contact your carrier to enable Wi-Fi Calling.</item>
</string-array> </string-array>
<!-- Template for showing cellular network operator name while WFC is active -->
<string name="wfcSpnFormat">%s Wi-Fi Calling</string>
</resources> </resources>

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

@@ -251,6 +251,8 @@
<string-array name="wfcOperatorErrorCodes" translatable="false" /> <string-array name="wfcOperatorErrorCodes" translatable="false" />
<!-- WFC Operator Error Messages --> <!-- WFC Operator Error Messages -->
<string-array name="wfcOperatorErrorMessages" /> <string-array name="wfcOperatorErrorMessages" />
<!-- Template for showing cellular network operator name while WFC is active -->
<string name="wfcSpnFormat">%s</string>
<!-- <!--
{0} is one of "bearerServiceCode*" {0} is one of "bearerServiceCode*"

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

@@ -748,6 +748,7 @@
<java-symbol type="string" name="wfcRegErrorTitle" /> <java-symbol type="string" name="wfcRegErrorTitle" />
<java-symbol type="array" name="wfcOperatorErrorCodes" /> <java-symbol type="array" name="wfcOperatorErrorCodes" />
<java-symbol type="array" name="wfcOperatorErrorMessages" /> <java-symbol type="array" name="wfcOperatorErrorMessages" />
<java-symbol type="string" name="wfcSpnFormat" />
<java-symbol type="string" name="policydesc_disableCamera" /> <java-symbol type="string" name="policydesc_disableCamera" />
<java-symbol type="string" name="policydesc_encryptedStorage" /> <java-symbol type="string" name="policydesc_encryptedStorage" />
<java-symbol type="string" name="policydesc_expirePassword" /> <java-symbol type="string" name="policydesc_expirePassword" />