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

Commit ea68e8ea authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Add new SPN format for "WiFi Call"." into udc-dev am: 31e01215 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21802708



Change-Id: Iade01758ea7a2af9721aab79e155b4940b05ae8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43a27935 31e01215

core/res/res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -327,6 +327,7 @@ 
        <item>@string/wfcSpnFormat_wifi_calling_wo_hyphen</item>

        <item>@string/wfcSpnFormat_wifi_calling_wo_hyphen</item>

        <item>@string/wfcSpnFormat_vowifi</item>

        <item>@string/wfcSpnFormat_vowifi</item>

        <item>@string/wfcSpnFormat_spn_wifi_calling_vo_hyphen</item>

        <item>@string/wfcSpnFormat_spn_wifi_calling_vo_hyphen</item>

        <item>@string/wfcSpnFormat_wifi_call</item>

    </string-array>

    </string-array>





    <!-- Spn during Wi-Fi Calling: "<operator>" -->

    <!-- Spn during Wi-Fi Calling: "<operator>" -->
@@ -353,6 +354,8 @@ 
    <string name="wfcSpnFormat_wifi_calling_wo_hyphen">WiFi Calling</string>

    <string name="wfcSpnFormat_wifi_calling_wo_hyphen">WiFi Calling</string>

    <!-- Spn during Wi-Fi Calling: "VoWifi" -->

    <!-- Spn during Wi-Fi Calling: "VoWifi" -->

    <string name="wfcSpnFormat_vowifi">VoWifi</string>

    <string name="wfcSpnFormat_vowifi">VoWifi</string>

    <!-- Spn during Wi_Fi Calling: "WiFi Call" (without hyphen).  This string is shown in the call banner for calls which take place over a WiFi network. -->

    <string name="wfcSpnFormat_wifi_call">WiFi Call</string>





    <!-- WFC, summary for Disabled -->

    <!-- WFC, summary for Disabled -->

    <string name="wifi_calling_off_summary">Off</string>

    <string name="wifi_calling_off_summary">Off</string>

telephony/java/android/telephony/CarrierConfigManager.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -1628,6 +1628,7 @@ public class CarrierConfigManager { 
     * <li>  9: WiFi Calling</li>

     * <li>  9: WiFi Calling</li>

     * <li> 10: VoWifi</li>

     * <li> 10: VoWifi</li>

     * <li> 11: %s WiFi Calling</li>

     * <li> 11: %s WiFi Calling</li>

     * <li> 12: WiFi Call</li>

     * @hide

     * @hide

     */

     */

    public static final String KEY_WFC_SPN_FORMAT_IDX_INT = "wfc_spn_format_idx_int";

    public static final String KEY_WFC_SPN_FORMAT_IDX_INT = "wfc_spn_format_idx_int";