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

Commit 6acd6102 authored by Sanket Padawe's avatar Sanket Padawe Committed by android-build-merger
Browse files

Merge "Update strings for modem restricted state." into oc-dev 

am: 58977d10

Change-Id: Id08df9dfdc858dfc4dfb31e7c6ad85fbe2b1869a
parents 52e73d8f 58977d10

core/res/res/values/strings.xml

+4 −10
Original line number Diff line number Diff line
@@ -191,21 +191,15 @@ 


    <!-- Notification title to tell the user that data service is blocked by access control. -->

    <string name="RestrictedOnDataTitle">No data service</string>

    <!-- Notification title to tell the user that emergency service is blocked by access control. -->

    <string name="RestrictedOnEmergencyTitle">No emergency service</string>

    <!-- Notification title to tell the user that emergency calling is blocked by access control. -->

    <string name="RestrictedOnEmergencyTitle">No emergency calling</string>

    <!-- Notification title to tell the user that normal service is blocked by access control. -->

    <string name="RestrictedOnNormalTitle">No voice service</string>

    <!-- Notification title to tell the user that all emergency and normal voice services are blocked by access control. -->

    <string name="RestrictedOnAllVoiceTitle">No voice/emergency service</string>



    <!-- Notification content to tell the user that data service is blocked by access control. -->

    <string name="RestrictedOnDataContent">Your carrier has temporarily suspended data service at this location</string>

    <!-- Notification content to tell the user that emergency service is blocked by access control. -->

    <string name="RestrictedOnEmergencyContent">Your carrier has temporarily suspended emergency calls at this location</string>

    <!-- Notification content to tell the user that normal service is blocked by access control. -->

    <string name="RestrictedOnNormalContent">Your carrier has temporarily suspended voice calls at this location</string>

    <!-- Notification content to tell the user that all emergency and normal voice services are blocked by access control. -->

    <string name="RestrictedOnAllVoiceContent">Your carrier has temporarily suspended voice and emergency calls at this location</string>

    <!-- Notification content to tell the user that voice/data/emergency service is blocked by access control. -->

    <string name="RestrictedStateContent">Temporarily not offered by the mobile network at your location</string>



    <!-- Displayed to tell the user that they should switch their network preference. -->

    <string name="NetworkPreferenceSwitchTitle">Can\u2019t reach network</string>

core/res/res/values/symbols.xml

+1 −4
Original line number Diff line number Diff line
@@ -527,10 +527,7 @@ 
  <java-symbol type="string" name="RestrictedOnDataTitle" />

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

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

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

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

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

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

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

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

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

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