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

Merge "Increase customization options for wfcSpnFormats" am: 34721e16a0

Browse Source 
am: 5e88fe2fbc

Change-Id: I78785e6eb0aebc8ee5fc94fa17a626835cfd56d8
This commit is contained in:
Youming Ye
2018-09-17 11:28:21 -07:00
committed by android-build-merger
parent 2cb9a70cac 5e88fe2fbc
commit 3b03a305b0
4 changed files with 34 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/res/res/values-mcc302-mnc370/strings.xml
View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2017, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Template for showing mobile network operator name while WFC is active -->
<string-array name="wfcSpnFormats">
<item>%s</item>
<item>%s Wi-Fi</item>
</string-array>
</resources>

25
core/res/res/values-mcc302-mnc720/strings.xml
View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2017, 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.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Template for showing mobile network operator name while WFC is active -->
<string-array name="wfcSpnFormats">
<item>%s</item>
<item>%s Wi-Fi</item>
</string-array>
</resources>

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

@@ -240,10 +240,31 @@
<item>Issue registering Wi\u2011Fi calling with your carrier: <xliff:g id="code" example="REG09 - No 911 Address">%1$s</xliff:g></item>
</string-array>
<!-- Template for showing mobile network operator name while WFC is active -->
<string-array name="wfcSpnFormats">
<item>%s</item>
<item>%s Wi-Fi Calling</item>
<string-array name="wfcSpnFormats" translatable="false">
<item>@string/wfcSpnFormat_spn</item>
<item>@string/wfcSpnFormat_spn_wifi_calling</item>
<item>@string/wfcSpnFormat_wlan_call</item>
<item>@string/wfcSpnFormat_spn_wlan_call</item>
<item>@string/wfcSpnFormat_spn_wifi</item>
<item>@string/wfcSpnFormat_wifi_calling_bar_spn</item>
<item>@string/wfcSpnFormat_spn_vowifi</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: "WLAN Call" -->
<string name="wfcSpnFormat_wlan_call">WLAN Call</string>
<!-- Spn during Wi-Fi Calling: "<operator> WLAN Call" -->
<string name="wfcSpnFormat_spn_wlan_call"><xliff:g id="spn" example="Operator">%s</xliff:g> WLAN Call</string>
<!-- Spn during Wi-Fi Calling: "<operator> Wi-Fi" -->
<string name="wfcSpnFormat_spn_wifi"><xliff:g id="spn" example="Operator">%s</xliff:g> Wi-Fi</string>
<!-- Spn during Wi-Fi Calling: "WiFi Calling | <operator>" -->
<string name="wfcSpnFormat_wifi_calling_bar_spn">WiFi Calling | <xliff:g id="spn" example="Operator">%s</xliff:g></string>
<!-- Spn during Wi-Fi Calling: "<operator> VoWifi" -->
<string name="wfcSpnFormat_spn_vowifi"><xliff:g id="spn" example="Operator">%s</xliff:g> VoWifi</string>
<!-- WFC, summary for Disabled -->
<string name="wifi_calling_off_summary">Off</string>
<!-- WFC, summary for Wi-Fi Preferred -->

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

@@ -1070,6 +1070,16 @@ public class CarrierConfigManager {
/**
* Indexes of SPN format strings in wfcSpnFormats and wfcDataSpnFormats.
*
* <p>Available options are:
* <ul>
* <li> 0: %s</li>
* <li> 1: %s Wi-Fi Calling</li>
* <li> 2: WLAN Call</li>
* <li> 3: %s WLAN Call</li>
* <li> 4: %s Wi-Fi</li>
* <li> 5: WiFi Calling | %s</li>
* <li> 6: %s VoWifi</li>
* @hide
*/
public static final String KEY_WFC_SPN_FORMAT_IDX_INT = "wfc_spn_format_idx_int";