summaryrefslogtreecommitdiff
path: root/src/com
diff options
context:
space:
mode:
authorTa-wei Yen <twyen@google.com>2016-03-22 10:33:44 -0700
committerTa-wei Yen <twyen@google.com>2016-03-22 10:33:44 -0700
commitf0f07d585c95d2bda8a59e9dcffdb687cb21c0fa (patch)
tree307d50ebecf777d5f44a515040e22013e00de3fa /src/com
parent664300c657fbfec010c3d2e948a387705ac69f64 (diff)
Update number blocking strings
+ No message string for unblocking, same as new filtering. + String for blocking with new filtering Fixes:27703247 Change-Id: I4622d9223e03e3c3f207da581ce5b28ee4aa2b42
Diffstat (limited to 'src/com')
-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);