commit f5470bcf377666bf9a97114c27541e1c931f3fe6
author Ta-wei Yen <twyen@google.com> Mon Nov 09 19:23:05 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 09 19:23:05 2015 +0000
tree ed83fbc60d03fbe2dfd9b6e7feca2e56a7583e00
parent 1fb423e6ffa45d081a2b017af9ab5a0a3029ba5e
parent cca8ca6723a5b47011b2ec65f6c53597025f3b94

Merge "Dialer Call Blocking String Changes" into ub-contactsdialer-a-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 37b2a5c..33fbbb6 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>

src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java

diff --git a/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java b/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java
index 792cead..91d4d12 100644
--- a/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java
+++ b/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java
@@ -138,7 +138,7 @@
                     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,