1 files changed, 11 insertions, 6 deletions
diff --git a/src/com/android/incallui/CallButtonFragment.java b/src/com/android/incallui/CallButtonFragment.java
index b960c71b..c5604b17 100644
--- a/src/com/android/incallui/CallButtonFragment.java
+++ b/src/com/android/incallui/CallButtonFragment.java
@@ -21,9 +21,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.graphics.drawable.LayerDrawable;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.Message;
 import android.telecom.AudioState;
 import android.telecom.VideoProfile;
 import android.view.ContextThemeWrapper;
@@ -40,6 +38,7 @@ import android.widget.PopupMenu;
 import android.widget.Toast;
 import android.widget.PopupMenu.OnDismissListener;
 import android.widget.PopupMenu.OnMenuItemClickListener;
+import com.android.internal.telephony.util.BlacklistUtils;
 
 import java.util.ArrayList;
 
@@ -131,11 +130,13 @@ public class CallButtonFragment
         mMoreMenuButton = (ImageButton) parent.findViewById(R.id.moreMenuButton);
         if (mMoreMenuButton != null) {
             boolean canRecordCalls = ((InCallActivity)getActivity()).isCallRecorderEnabled();
-            if (canRecordCalls) {
+            boolean blacklistEnabled = BlacklistUtils.isBlacklistEnabled(getActivity());
+            if (canRecordCalls || blacklistEnabled) {
                 mMoreMenuButton.setOnClickListener(this);
-                mMoreMenu = new MorePopupMenu(parent.getContext(), mMoreMenuButton);
-
-                mMoreMenu.inflate(R.menu.incall_more_menu);
+                final ContextThemeWrapper contextWrapper = new ContextThemeWrapper(getActivity(),
+                        R.style.InCallPopupMenuStyle);
+                mMoreMenu = new MorePopupMenu(contextWrapper, mMoreMenuButton /* anchorView */);
+                mMoreMenu.getMenuInflater().inflate(R.menu.incall_more_menu, mMoreMenu.getMenu());
                 mMoreMenu.setOnMenuItemClickListener(this);
 
                 mMoreMenuButton.setOnTouchListener(mMoreMenu.getDragToOpenListener());
@@ -546,6 +547,10 @@ public class CallButtonFragment
 
                 return true;
 
+            case R.id.menu_add_to_blacklist:
+                getPresenter().blacklistClicked(getActivity());
+                return true;
+
             default:
                 Log.e(this, "onMenuItemClick:  unexpected View ID " + item.getItemId()
                         + " (MenuItem = '" + item + "')");