diff options
| author | John Wang <johnwang@google.com> | 2010-03-04 13:30:48 -0800 |
|---|---|---|
| committer | John Wang <johnwang@google.com> | 2010-03-04 14:09:24 -0800 |
| commit | fc26c77f617eb64857127d80618b79de61b18341 (patch) | |
| tree | 05652d3a756118f94a66ec6990aef8a4b55216ae | |
| parent | 1a31ae34a073b9769775f9e6cf5818888173a8e8 (diff) | |
| download | frameworks_base-fc26c77f617eb64857127d80618b79de61b18341.zip frameworks_base-fc26c77f617eb64857127d80618b79de61b18341.tar.gz frameworks_base-fc26c77f617eb64857127d80618b79de61b18341.tar.bz2 | |
Update DSAC notification.
Update the notification string of CS restricted per DoCoMo's request. More restricted message string are added for future use.
| -rw-r--r-- | core/res/res/values/strings.xml | 14 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d34599f..8308801 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -131,9 +131,17 @@ <!-- Displayed to tell the user that emergency service is blocked by access control. --> <string name="RestrictedOnEmergency">Emergency service is blocked.</string> <!-- Displayed to tell the user that normal service is blocked by access control. --> - <string name="RestrictedOnNormal">Voice/SMS service is blocked.</string> - <!-- Displayed to tell the user that all voice service is blocked by access control. --> - <string name="RestrictedOnAll">All voice/SMS services are blocked.</string> + <string name="RestrictedOnNormal">Voice service is blocked.</string> + <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. --> + <string name="RestrictedOnAllVoice">All Voice services are blocked.</string> + <!-- Displayed to tell the user that sms service is blocked by access control. --> + <string name="RestrictedOnSms">SMS service is blocked.</string> + <!-- Displayed to tell the user that voice/data service is blocked by access control. --> + <string name="RestrictedOnVoiceData">Voice/Data services are blocked.</string> + <!-- Displayed to tell the user that voice and sms service are blocked by access control. --> + <string name="RestrictedOnVoiceSms">Voice/SMS services are blocked.</string> + <!-- Displayed to tell the user that all service is blocked by access control. --> + <string name="RestrictedOnAll">All Voice/Data/SMS services are blocked.</string> <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings--> <skip /> <!-- Example: Service was enabled for: Voice, Data --> diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 6352b41..e4fcf6c 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -1630,7 +1630,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { notificationId = PS_NOTIFICATION; break; case CS_ENABLED: - details = context.getText(com.android.internal.R.string.RestrictedOnAll);; + details = context.getText(com.android.internal.R.string.RestrictedOnAllVoice);; break; case CS_NORMAL_ENABLED: details = context.getText(com.android.internal.R.string.RestrictedOnNormal);; |