summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAnne Rong <annerong@google.com>2015-09-03 18:18:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-03 18:18:01 +0000
commitfd29654b6075d49ca973678a276793e9f1767c16 (patch)
treed300ed5ffc54e2b1de2ea068676062b47b1a4184 /res
parent88f9ea2b1fc20a0893cf81389ddcd7ceb497ccb2 (diff)
parent9bd094118e920b732394c29657f26b062f3e916b (diff)
Merge "Add block/unblock number to calllog longpress menu" into ub-contactsdialer-a-dev
Diffstat (limited to 'res')
-rw-r--r--res/values/ids.xml1
-rw-r--r--res/values/strings.xml32
2 files changed, 33 insertions, 0 deletions
diff --git a/res/values/ids.xml b/res/values/ids.xml
index cb2025aa9..0034fe3d4 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -18,5 +18,6 @@
<item type="id" name="context_menu_copy_to_clipboard" />
<item type="id" name="context_menu_copy_transcript_to_clipboard" />
<item type="id" name="context_menu_edit_before_call" />
+ <item type="id" name="context_menu_block_number" />
<item type="id" name="settings_header_sounds_and_vibration" />
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1ce6ab65c..7bd88baef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -52,6 +52,24 @@
<!-- Option displayed in context menu to copy long pressed voicemail transcription to clipboard [CHAR LIMIT=64] -->
<string name="copy_transcript_text">Copy transcription to clipboard</string>
+ <!-- Menu item used to block a number from the call log [CHAR LIMIT=64] -->
+ <string name="call_log_block_number">Block number</string>
+
+ <!-- Text for snackbar to undo blocking a number. [CHAR LIMIT=64] -->
+ <string name="snackbar_number_blocked">
+ <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> added to block list</string>
+
+ <!-- Menu item used to unblock a number from the call log [CHAR LIMIT=64]-->
+ <string name="call_log_unblock_number">Unblock number</string>
+
+ <!-- Text for snackbar to undo unblocking a number. [CHAR LIMIT=64] -->
+ <string name="snackbar_number_unblocked">
+ <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g>
+ removed from block list</string>
+
+ <!-- Text for undo button in snackbar for blocking/unblocking number. [CHAR LIMIT=10] -->
+ <string name="block_number_undo">UNDO</string>
+
<!-- Menu item used to copy a number from the call log to the dialer so it can be edited before calling it -->
<string name="call_log_edit_number_before_call">Edit number before call</string>
@@ -490,6 +508,20 @@
[CHAR LIMIT=30] -->
<string name="call_log_voicemail_title">Voicemail</string>
+ <!-- Confirmation dialog for blocking a number. [CHAR LIMIT=NONE] -->
+ <string name="blockNumberConfirmation">Add
+ <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> to your block list?</string>
+
+ <!-- Block number alert dialog button [CHAR LIMIT=32] -->
+ <string name="blockNumberOk">Block number</string>
+
+ <!-- Confirmation dialog for unblocking a number. [CHAR LIMIT=NONE] -->
+ <string name="unblockNumberConfirmation">Remove
+ <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> from your block list?</string>
+
+ <!-- Unblock number alert dialog button [CHAR LIMIT=32] -->
+ <string name="unblockNumberOk">Unblock number</string>
+
<!-- Accessibility text for the tab showing recent and favorite contacts who can be called.
[CHAR LIMIT=40] -->
<string name="tab_speed_dial">Speed dial</string>