Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 58977d1035

Change-Id: Id08df9dfdc858dfc4dfb31e7c6ad85fbe2b1869a
This commit is contained in:
Sanket Padawe
2017-06-07 21:53:44 +00:00
committed by android-build-merger
parent 52e73d8ffb 58977d1035
commit 6acd6102c9
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/res/res/values/strings.xml
View File

@@ -191,21 +191,15 @@
<!-- Notification title to tell the user that data service is blocked by access control. --> <!-- Notification title to tell the user that data service is blocked by access control. -->
<string name="RestrictedOnDataTitle">No data service</string> <string name="RestrictedOnDataTitle">No data service</string>
<!-- Notification title to tell the user that emergency service is blocked by access control. --> <!-- Notification title to tell the user that emergency calling is blocked by access control. -->
<string name="RestrictedOnEmergencyTitle">No emergency service</string> <string name="RestrictedOnEmergencyTitle">No emergency calling</string>
<!-- Notification title to tell the user that normal service is blocked by access control. --> <!-- Notification title to tell the user that normal service is blocked by access control. -->
<string name="RestrictedOnNormalTitle">No voice service</string> <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. --> <!-- 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> <string name="RestrictedOnAllVoiceTitle">No voice/emergency service</string>
<!-- Notification content to tell the user that data service is blocked by access control. --> <!-- Notification content to tell the user that voice/data/emergency service is blocked by access control. -->
<string name="RestrictedOnDataContent">Your carrier has temporarily suspended data service at this location</string> <string name="RestrictedStateContent">Temporarily not offered by the mobile network at your 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>
<!-- Displayed to tell the user that they should switch their network preference. --> <!-- Displayed to tell the user that they should switch their network preference. -->
<string name="NetworkPreferenceSwitchTitle">Can\u2019t reach network</string> <string name="NetworkPreferenceSwitchTitle">Can\u2019t reach network</string>

5
core/res/res/values/symbols.xml
View File

@@ -527,10 +527,7 @@
<java-symbol type="string" name="RestrictedOnDataTitle" /> <java-symbol type="string" name="RestrictedOnDataTitle" />
<java-symbol type="string" name="RestrictedOnEmergencyTitle" /> <java-symbol type="string" name="RestrictedOnEmergencyTitle" />
<java-symbol type="string" name="RestrictedOnNormalTitle" /> <java-symbol type="string" name="RestrictedOnNormalTitle" />
<java-symbol type="string" name="RestrictedOnAllVoiceContent" /> <java-symbol type="string" name="RestrictedStateContent" />
<java-symbol type="string" name="RestrictedOnDataContent" />
<java-symbol type="string" name="RestrictedOnEmergencyContent" />
<java-symbol type="string" name="RestrictedOnNormalContent" />
<java-symbol type="string" name="notification_channel_network_alert" /> <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_call_forward" />
<java-symbol type="string" name="notification_channel_emergency_callback" /> <java-symbol type="string" name="notification_channel_emergency_callback" />