commit b49c527b2ac16a189dfa61f9cdecdcafbf61fcc2
author Wenyi Wang <wenyiw@google.com> Fri Feb 12 10:42:59 2016 -0800
committer Wenyi Wang <wenyiw@google.com> Fri Feb 12 10:42:59 2016 -0800
tree 671adf8aad8fcbecdff89abb69daf17458f902a8
parent 4f1e441c427d3033f82c6aa4fb14bd0d30cd64a1

Use blocked numbers UI in framework

Bug 27120737

Change-Id: I8380f8a9f753755c5ad3efd68332372ce80dea34

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index c07b94e..3077a63 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -41,6 +41,7 @@
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
+import android.telecom.TelecomManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyCharacterMap;
@@ -58,6 +59,7 @@
 import com.android.contacts.activities.ActionBarAdapter.TabState;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
+import com.android.contacts.common.compat.TelecomManagerUtil;
 import com.android.contacts.common.dialog.ClearFrequentsDialog;
 import com.android.contacts.common.interactions.ImportExportDialogFragment;
 import com.android.contacts.common.list.ContactEntryListFragment;
@@ -1095,11 +1097,12 @@
             helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable());
         }
         final boolean showMiscOptions = !isSearchOrSelectionMode;
+        final boolean showBlockedNumbers = PhoneCapabilityTester.isPhone(this)
+                && ContactsUtils.FLAG_N_FEATURE;
         makeMenuItemVisible(menu, R.id.menu_search, showMiscOptions);
         makeMenuItemVisible(menu, R.id.menu_import_export, showMiscOptions);
         makeMenuItemVisible(menu, R.id.menu_accounts, showMiscOptions);
-        // TODO make menu_blocked_numbers visible by using UI in framework
-        makeMenuItemVisible(menu, R.id.menu_blocked_numbers, false);
+        makeMenuItemVisible(menu, R.id.menu_blocked_numbers, showBlockedNumbers);
         makeMenuItemVisible(menu, R.id.menu_settings,
                 showMiscOptions && !ContactsPreferenceActivity.isEmpty(this));
 
@@ -1207,6 +1210,8 @@
                 return true;
             }
             case R.id.menu_blocked_numbers: {
+                TelecomManagerUtil.launchBlockedNumbersActivity(
+                        (TelecomManager) getSystemService(Context.TELECOM_SERVICE));
                 return true;
             }
             case R.id.export_database: {