diff options
author | Ta-wei Yen <twyen@google.com> | 2015-11-05 14:13:12 -0800 |
---|---|---|
committer | Ta-wei Yen <twyen@google.com> | 2015-11-06 22:54:14 +0000 |
commit | a5437e6882bde69cb795ed8d929c1024a8fef16e (patch) | |
tree | 1778d022d1c44d7dba00dd50abb726de8f05238b /res/values | |
parent | 6e0fd6b77759baf43cb37d407041be051b4856b5 (diff) | |
download | android_packages_apps_Dialer-a5437e6882bde69cb795ed8d929c1024a8fef16e.tar.gz android_packages_apps_Dialer-a5437e6882bde69cb795ed8d929c1024a8fef16e.tar.bz2 android_packages_apps_Dialer-a5437e6882bde69cb795ed8d929c1024a8fef16e.zip |
Call Blocking UI/String change
+ Adjusted UI/String according to new specifications.
+ Added class VisualVoicemailEnabledChecker
+ Block number dialog display different message depending
on whether VVM is activated.
Bug:25455707
Change-Id: I09425053c91a5517e309302d421beadcc2d81cd4
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/colors.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 44 |
2 files changed, 35 insertions, 10 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 2ca697f2e..e927f740f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -133,6 +133,7 @@ <color name="blocked_number_block_color">#F44336</color> <color name="blocked_number_header_color">@color/dialer_theme_color</color> <color name="blocked_number_disabled_emergency_header_color">#616161</color> + <color name="add_blocked_number_icon_color">#bdbdbd</color> <!-- Grey 700 --> <color name="call_detail_footer_text_color">#616161</color> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4682b76cc..37b2a5cb4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -59,7 +59,7 @@ <!-- 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> + <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> blocked</string> <!-- Label for action to unblock a number [CHAR LIMIT=48]--> <string name="action_unblock_number">Unblock number</string> @@ -67,7 +67,7 @@ <!-- 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> + unblocked</string> <!-- Text for undo button in snackbar for blocking/unblocking number. [CHAR LIMIT=10] --> <string name="block_number_undo">UNDO</string> @@ -519,19 +519,31 @@ [CHAR LIMIT=30] --> <string name="call_log_voicemail_title">Voicemail</string> - <!-- Confirmation dialog for blocking a number. [CHAR LIMIT=NONE] --> - <string name="blockNumberConfirmation">Add + <!-- Confirmation dialog title for blocking a number. [CHAR LIMIT=NONE] --> + <string name="block_number_confirmation_title">Add <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g> to your block list?</string> + <!-- Confirmation dialog message for blocking a number with visual voicemail active. + [CHAR LIMIT=NONE] --> + <string name="block_number_confirmation_message_vvm"> + Future calls from this number will be blocked and voicemails will be automatically deleted. + </string> + + <!-- Confirmation dialog message for blocking a number with no visual voicemail. + [CHAR LIMIT=NONE] --> + <string name="block_number_confirmation_message_no_vvm"> + Future calls from this number will be blocked. Voicemails may still reach you. + </string> + <!-- Block number alert dialog button [CHAR LIMIT=32] --> - <string name="blockNumberOk">Block number</string> + <string name="block_number_ok">BLOCK</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> + <string name="unblock_number_confirmation_title">Unblock + <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g></string> <!-- Unblock number alert dialog button [CHAR LIMIT=32] --> - <string name="unblockNumberOk">Unblock number</string> + <string name="unblock_number_ok">UNBLOCK</string> <!-- Accessibility text for the tab showing recent and favorite contacts who can be called. [CHAR LIMIT=40] --> @@ -830,7 +842,7 @@ <string name="call_settings_label">Calls</string> <!-- Label for the blocked numbers settings section [CHAR LIMIT=30] --> - <string name="manage_blocked_numbers_label">Blocked numbers</string> + <string name="manage_blocked_numbers_label">Call blocking</string> <!-- Label for a section describing that call blocking is temporarily disabled because an emergency call was made. [CHAR LIMIT=50] --> @@ -877,8 +889,20 @@ <!-- Button to bring up UI to add a number to the blocked call list. [CHAR LIMIT=40] --> <string name="addBlockedNumber">Add number</string> + <!-- Footer message of number blocking screen with visual voicemail active. + [CHAR LIMIT=NONE] --> + <string name="block_number_footer_message_vvm"> + Adding a number blocks all future calls and voicemails will be automatically deleted. + </string> + + <!-- Footer message of number blocking screen with no visual voicemail. + [CHAR LIMIT=NONE] --> + <string name="block_number_footer_message_no_vvm"> + Adding a number blocks all future calls. Voicemails may still reach you. + </string> + <!-- Heading for the block list in the "Spam and blocked cal)ls" settings. [CHAR LIMIT=64] --> - <string name="blockList">Block list</string> + <string name="block_list">Blocked numbers</string> <!-- Error message shown when user tries to add invalid number to the block list. [CHAR LIMIT=64] --> |