summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-10-28 22:05:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-28 22:05:56 +0000
commita8b009be501545b6b6f90f3d508d6b7f7032e6c3 (patch)
treeb01be491bc548d28949906424fd66f2705c98193 /res
parentf5b31d096a67bf7e1f768b80f74a62c243f1f307 (diff)
parent9155416b1679a84b184959ce83c81d42d2dc7380 (diff)
Merge "Notify for call blocking disabled by E911." into ub-contactsdialer-a-dev
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml19
1 files changed, 13 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b5703c6bf..f74d2ea0f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -883,12 +883,6 @@
<!-- Heading for the block list in the "Spam and blocked cal)ls" settings. [CHAR LIMIT=64] -->
<string name="blockList">Block list</string>
- <!-- Label for progress dialog when validating a number to be added to the block list.
- [CHAR LIMIT=64] -->
- <string name="checkingNumber">Checking
- <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g>
- </string>
-
<!-- Error message shown when user tries to add invalid number to the block list.
[CHAR LIMIT=64] -->
<string name="invalidNumber"><xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g>
@@ -899,6 +893,19 @@
<string name="alreadyBlocked"><xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g>
is already blocked.</string>
+ <!-- Title of notification telling the user that call blocking has been temporarily disabled.
+ [CHAR LIMIT=56] -->
+ <string name="call_blocking_disabled_notification_title">
+ Call blocking disabled for 48 hours
+ </string>
+
+ <!-- Text for notification which provides the reason that call blocking has been temporarily
+ disabled. Namely, we disable call blocking after an emergency call in case of return
+ phone calls made by emergency services. [CHAR LIMIT=64] -->
+ <string name="call_blocking_disabled_notification_text">
+ Disabled because an emergency call was made.
+ </string>
+
<!-- Label for the phone account settings [CHAR LIMIT=30] -->
<string name="phone_account_settings_label">Calling accounts</string>