From cca8ca6723a5b47011b2ec65f6c53597025f3b94 Mon Sep 17 00:00:00 2001
From: Ta-wei Yen <twyen@google.com>
Date: Fri, 6 Nov 2015 18:39:54 -0800
Subject: Dialer Call Blocking String Changes

Bug:25455707
Change-Id: I5abc3956269a58362f8e2df0132d17a99de3764e
---
 res/values/strings.xml                                       | 12 +++++++++---
 .../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,
-- 
cgit v1.2.3