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

Commit 1d33a37e authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by Android (Google) Code Review
Browse files

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

parents 579535ac e4fac93d

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

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

    <string-array name="wfcOperatorErrorMessages">

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

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

    </string-array>

    </string-array>

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

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

</resources>
 
</resources>

core/res/res/values/strings.xml

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

    <string-array name="wfcOperatorErrorCodes" translatable="false" />

    <!-- WFC Operator Error Messages -->

    <!-- WFC Operator Error Messages -->

    <string-array name="wfcOperatorErrorMessages" />

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

        {0} is one of "bearerServiceCode*"

core/res/res/values/symbols.xml

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

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

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

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

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

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

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

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

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

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