Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee20b465 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

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

am: d7673a30

Change-Id: Iee7dec8eb787a21845f5d45caa7aea0dc1f54097
parents 2822c25b d7673a30

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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" -->

telephony/java/android/telephony/CarrierConfigManager.java

+1 −0
Original line number Diff line number Diff line
@@ -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";