Merge "Make contacts app aware of phone blacklist setting (3/3)" into cm-10.1

3 files changed, 17 insertions, 0 deletions

diff --git a/src/com/android/contacts/CallDetailActivity.java b/src/com/android/contacts/CallDetailActivity.java
index e5ee0b58a..e6fc59e63 100644
--- a/src/com/android/contacts/CallDetailActivity.java
+++ b/src/com/android/contacts/CallDetailActivity.java
@@ -115,6 +115,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
     private boolean mHasTrashOption;
     /** Whether we should show "remove from call log" in the options menu. */
     private boolean mHasRemoveFromCallLogOption;
+    /** Whether we should show "add to blacklist" in the options menu */
+    private boolean mHasBlacklistOption;
 
     private ProximitySensorManager mProximitySensorManager;
     private final ProximitySensorListener mProximitySensorListener = new ProximitySensorListener();
@@ -353,6 +355,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
                 mHasEditNumberBeforeCallOption = mCallDetailHeader.canEditNumberBeforeCall();
                 mHasTrashOption = hasVoicemail();
                 mHasRemoveFromCallLogOption = !hasVoicemail();
+                mHasBlacklistOption = mContactInfoHelper.canBlacklistCalls();
+
                 invalidateOptionsMenu();
 
                 ListView historyList = (ListView) findViewById(R.id.history);
@@ -510,6 +514,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
         menu.findItem(R.id.menu_remove_from_call_log).setVisible(mHasRemoveFromCallLogOption);
         menu.findItem(R.id.menu_edit_number_before_call).setVisible(mHasEditNumberBeforeCallOption);
         menu.findItem(R.id.menu_trash).setVisible(mHasTrashOption);
+        menu.findItem(R.id.menu_add_to_blacklist).setVisible(mHasBlacklistOption);
         return super.onPrepareOptionsMenu(menu);
     }
 
diff --git a/src/com/android/contacts/calllog/ContactInfoHelper.java b/src/com/android/contacts/calllog/ContactInfoHelper.java
index d389b23ef..aeb659cee 100644
--- a/src/com/android/contacts/calllog/ContactInfoHelper.java
+++ b/src/com/android/contacts/calllog/ContactInfoHelper.java
@@ -22,6 +22,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.PhoneLookup;
+import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.widget.Toast;
@@ -234,4 +235,13 @@ public class ContactInfoHelper {
         String message = mContext.getString(R.string.toast_added_to_blacklist, number);
         Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show();
     }
+
+    /**
+     * Checks whether calls can be blacklisted; that is, whether the
+     * phone blacklist is enabled
+     */
+    public boolean canBlacklistCalls() {
+        return Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.PHONE_BLACKLIST_ENABLED, 1) != 0;
+    }
 }
diff --git a/src/com/android/contacts/callstats/CallStatsDetailActivity.java b/src/com/android/contacts/callstats/CallStatsDetailActivity.java
index 25e29897f..927723164 100644
--- a/src/com/android/contacts/callstats/CallStatsDetailActivity.java
+++ b/src/com/android/contacts/callstats/CallStatsDetailActivity.java
@@ -228,6 +228,8 @@ public class CallStatsDetailActivity extends Activity {
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.findItem(R.id.menu_edit_number_before_call).setVisible(
                 mCallDetailHeader.canEditNumberBeforeCall());
+        menu.findItem(R.id.menu_add_to_blacklist).setVisible(
+                mContactInfoHelper.canBlacklistCalls());
         return super.onPrepareOptionsMenu(menu);
     }