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

Merge "Add new WiFi Calling string without hyphen" into qt-dev

Browse Source 
am: d7673a30d9

Change-Id: Iee7dec8eb787a21845f5d45caa7aea0dc1f54097
This commit is contained in:
Pengquan Meng
2019-05-31 19:09:52 -07:00
committed by android-build-merger
parent 2822c25b89 d7673a30d9
commit ee20b46515
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,12 +252,15 @@
<item>@string/wfcSpnFormat_wifi</item>
<item>@string/wfcSpnFormat_wifi_calling_wo_hyphen</item>
<item>@string/wfcSpnFormat_vowifi</item>
<item>@string/wfcSpnFormat_spn_wifi_calling_vo_hyphen</item>
</string-array>
<!-- Spn during Wi-Fi Calling: "<operator>" -->
<string name="wfcSpnFormat_spn"><xliff:g id="spn" example="Operator">%s</xliff:g></string>
<!-- Spn during Wi-Fi Calling: "<operator> Wi-Fi Calling" -->
<string name="wfcSpnFormat_spn_wifi_calling"><xliff:g id="spn" example="Operator">%s</xliff:g> Wi-Fi Calling</string>
<!-- Spn during Wi-Fi Calling: "<operator> WiFi Calling" -->
<string name="wfcSpnFormat_spn_wifi_calling_vo_hyphen"><xliff:g id="spn" example="Operator">%s</xliff:g> WiFi Calling</string>
<!-- Spn during Wi-Fi Calling: "WLAN Call" -->
<string name="wfcSpnFormat_wlan_call">WLAN Call</string>
<!-- Spn during Wi-Fi Calling: "<operator> WLAN Call" -->

1
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1132,6 +1132,7 @@ public class CarrierConfigManager {
* <li> 8: Wi-Fi</li>
* <li> 9: WiFi Calling</li>
* <li> 10: VoWifi</li>
* <li> 11: %s WiFi Calling</li>
* @hide
*/
public static final String KEY_WFC_SPN_FORMAT_IDX_INT = "wfc_spn_format_idx_int";