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

Commit c24a5ad0 authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by android-build-merger
Browse files

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

automerge: 1d33a37e

* commit '1d33a37e':
  Add format string for displaying SPN in Wi-Fi calling mode.
parents 8c4e96f6 1d33a37e

core/res/res/values-mcc310-mnc260/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -29,4 +29,6 @@ 
    <string-array name="wfcOperatorErrorMessages">

        <item>Wi-Fi Calling isn\&apos;t available. Contact your carrier to enable Wi-Fi Calling.</item>

    </string-array>

    <!-- Template for showing cellular network operator name while WFC is active -->

    <string name="wfcSpnFormat">%s Wi-Fi Calling</string>

</resources>

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,8 @@ 
    <string-array name="wfcOperatorErrorCodes" translatable="false" />

    <!-- WFC Operator Error Messages -->

    <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*"

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -752,6 +752,7 @@ 
  <java-symbol type="string" name="wfcRegErrorTitle" />

  <java-symbol type="array" name="wfcOperatorErrorCodes" />

  <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_encryptedStorage" />

  <java-symbol type="string" name="policydesc_expirePassword" />