diff options
| author | Chen Xu <fionaxu@google.com> | 2017-08-05 22:54:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-05 22:54:29 +0000 |
| commit | 23228db86693cadf352843d6e56f888904f5461f (patch) | |
| tree | 8adc708c3a5e06ae7e7ec17056fce853aea3a838 | |
| parent | 72f5cb4fd2b1608bd3181059a6c562d594adf99f (diff) | |
| parent | 4812154af3b6d77e98f34ca12932e1136d3ae9e3 (diff) | |
Merge "rename notification channel" into oc-mr1-dev
| -rw-r--r-- | core/res/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index a8aa35f1d40c..6cd1151245f7 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -160,8 +160,8 @@ <string name="notification_channel_call_forward">Call forwarding</string> <!-- Telephony notification channel name for a channel containing emergency callback mode notifications. --> <string name="notification_channel_emergency_callback">Emergency callback mode</string> - <!-- Telephony notification channel name for a channel containing mobile data alert notifications. --> - <string name="notification_channel_mobile_data_alert">Mobile data alerts</string> + <!-- Telephony notification channel name for a channel containing mobile data status notifications. --> + <string name="notification_channel_mobile_data_status">Mobile data status</string> <!-- Telephony notification channel name for a channel containing sms notifications. --> <string name="notification_channel_sms">SMS messages</string> <!-- Telephony notification channel name for a channel containing voice mail notifications. --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index e7a95c8b88b5..e6f0bf0d5b94 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -540,7 +540,7 @@ <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" /> - <java-symbol type="string" name="notification_channel_mobile_data_alert" /> + <java-symbol type="string" name="notification_channel_mobile_data_status" /> <java-symbol type="string" name="notification_channel_sms" /> <java-symbol type="string" name="notification_channel_voice_mail" /> <java-symbol type="string" name="notification_channel_wfc" /> |