summaryrefslogtreecommitdiff
path: root/src/com/android
diff options
context:
space:
mode:
authorTa-wei Yen <twyen@google.com>2016-03-22 19:02:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-22 19:02:21 +0000
commit3d1b79090584aa90881fbdd43fe8278c1e2639f7 (patch)
treec859f22d1c7f05d37cf9a4663d32dfc9881f0695 /src/com/android
parent2b79a998ef06ec2f317632f7e9271c5e8a29f5ab (diff)
parent0a9d3be7e92dce46dffeaedb1e6aefc163122bfc (diff)
Update number blocking strings
am: 0a9d3be * commit '0a9d3be7e92dce46dffeaedb1e6aefc163122bfc': Update number blocking strings
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java b/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java
index de4fe99f1..ee4c607ac 100644
--- a/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java
+++ b/src/com/android/dialer/filterednumber/BlockNumberDialogFragment.java
@@ -32,6 +32,7 @@ import android.widget.Toast;
import com.android.contacts.common.util.ContactDisplayUtils;
import com.android.dialer.R;
+import com.android.dialer.compat.FilteredNumberCompat;
import com.android.dialer.database.FilteredNumberAsyncQueryHandler;
import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnBlockNumberListener;
import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnUnblockNumberListener;
@@ -156,13 +157,15 @@ public class BlockNumberDialogFragment extends DialogFragment {
R.string.unblock_number_confirmation_title,
mDisplayNumber);
okText = getString(R.string.unblock_number_ok);
- message = getString(R.string.unblock_number_confirmation_message);
+ message = "";
} else {
title = ContactDisplayUtils.getTtsSpannedPhoneNumber(getResources(),
R.string.block_number_confirmation_title,
mDisplayNumber);
okText = getString(R.string.block_number_ok);
- if (mVoicemailEnabledChecker.isVisualVoicemailEnabled()) {
+ if (FilteredNumberCompat.useNewFiltering()) {
+ message = getString(R.string.block_number_confirmation_message_new_filtering);
+ } else if (mVoicemailEnabledChecker.isVisualVoicemailEnabled()) {
message = getString(R.string.block_number_confirmation_message_vvm);
} else {
message = getString(R.string.block_number_confirmation_message_no_vvm);