diff options
| author | Ta-wei Yen <twyen@google.com> | 2015-11-09 19:28:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-09 19:28:06 +0000 |
| commit | 139400af082741f465905ac660e411272b119a5a (patch) | |
| tree | 408afc68842ed769178d707ed4f9698bde9b3f98 | |
| parent | 0a8fa4f16031c8e46c14f2f2d98bf42cb8cdbec3 (diff) | |
| parent | 2664b78740c71964b8c8fee78eb0a99b5ca09b71 (diff) | |
Merge "Dialer Call Blocking String Changes" into ub-contactsdialer-a-dev am: f5470bcf37
am: 2664b78740
* commit '2664b78740c71964b8c8fee78eb0a99b5ca09b71':
Dialer Call Blocking String Changes
| -rw-r--r-- | res/values/strings.xml | 12 | ||||
| -rw-r--r-- | src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 37b2a5cb4..33fbbb666 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -520,8 +520,8 @@ <string name="call_log_voicemail_title">Voicemail</string> <!-- 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> + <string name="block_number_confirmation_title">Block + <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g>?</string> <!-- Confirmation dialog message for blocking a number with visual voicemail active. [CHAR LIMIT=NONE] --> @@ -540,7 +540,13 @@ <!-- Confirmation dialog for unblocking a number. [CHAR LIMIT=NONE] --> <string name="unblock_number_confirmation_title">Unblock - <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g></string> + <xliff:g id="number" example="(555) 555-5555">%1$s</xliff:g>?</string> + + <!-- Confirmation dialog message for unblocking a number. + [CHAR LIMIT=NONE] --> + <string name="unblock_number_confirmation_message"> + This number will no longer be blocked from calling you. + </string> <!-- Unblock number alert dialog button [CHAR LIMIT=32] --> <string name="unblock_number_ok">UNBLOCK</string> diff --git a/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java b/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java index 792cead32..91d4d121d 100644 --- a/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java +++ b/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java @@ -138,7 +138,7 @@ public class BlockNumberDialogFragment extends DialogFragment R.string.unblock_number_confirmation_title, mDisplayNumber); okText = getString(R.string.unblock_number_ok); - message = null; + message = getString(R.string.unblock_number_confirmation_message); } else { title = ContactDisplayUtils.getTtsSpannedPhoneNumber(getResources(), R.string.block_number_confirmation_title, |