diff options
| author | 2017-06-07 21:50:30 +0000 | |
|---|---|---|
| committer | 2017-06-07 21:50:30 +0000 | |
| commit | 6ef238a51c27abbeb90b5e187be2eab9dfdfecbe (patch) | |
| tree | 2d4aafa364625df0d05fd8b3cc89852b7832ee13 | |
| parent | 59fe02cf95aa6a28c484ee5fcede17aa80e5bd30 (diff) | |
| parent | 58977d10353000e3edaf90ab447d6de92ad075a2 (diff) | |
Merge "Update strings for modem restricted state." into oc-dev
am: 58977d1035
Change-Id: I44ee9421ee32c68dd880176f12a89c8ecb3ae03b
| -rw-r--r-- | core/res/res/values/strings.xml | 14 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 5 |
2 files changed, 5 insertions, 14 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9c4d48965d86..97b6940a1d39 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ef7380032b90..1b6be86a2810 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -529,10 +529,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" /> |