diff options
| author | Rohit Yengisetty <rohit@cyngn.com> | 2016-04-12 10:34:54 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-04-14 23:45:57 -0700 |
| commit | dd2acf1026943e7e59aca01e9085916812e843e3 (patch) | |
| tree | 93b80e319905c81e83247bcd93dc0d1248e69988 | |
| parent | e4b31b77fd5e4197384e3180fc0a95517425b81a (diff) | |
| download | packages_apps_Contacts-dd2acf1026943e7e59aca01e9085916812e843e3.tar.gz packages_apps_Contacts-dd2acf1026943e7e59aca01e9085916812e843e3.tar.bz2 packages_apps_Contacts-dd2acf1026943e7e59aca01e9085916812e843e3.zip | |
Make Block action contingent on system-wide Blacklist setting
Change-Id: I9c7b474765fabcf0c8681367b49ba8ddb84f172e
| -rw-r--r-- | src/com/android/contacts/quickcontact/QuickContactActivity.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index 8ad67e0ae..7f6ae7faa 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -181,6 +181,7 @@ import com.cyanogen.ambient.discovery.util.NudgeKey; import com.cyanogen.ambient.incall.extension.OriginCodes; import com.cyanogen.ambient.plugin.PluginStatus; import com.android.contactsbind.HelpUtils; +import com.android.internal.telephony.util.BlacklistUtils; import com.cyanogen.lookup.phonenumber.provider.LookupProviderImpl; import com.google.common.collect.Lists; @@ -312,6 +313,8 @@ public class QuickContactActivity extends ContactsActivity implements private Target mContactBitmapTarget; private BlockContactHelper mBlockContactHelper; + private boolean mIsBlacklistingEnabled; + private Object mLock = new Object(); /** * {@link #LEADING_MIMETYPES} is used to sort MIME-types. @@ -1313,6 +1316,7 @@ public class QuickContactActivity extends ContactsActivity implements destroyInteractionLoaders(); startInteractionLoaders(mCachedCp2DataCardModel); } + mIsBlacklistingEnabled = BlacklistUtils.isBlacklistEnabled(this); } @Override @@ -2985,10 +2989,15 @@ public class QuickContactActivity extends ContactsActivity implements // set block or un-block menu titles accordingly final MenuItem blockMenuItem = menu.findItem(R.id.menu_block_contact); - if (mBlockContactHelper.isContactBlacklisted()) { - blockMenuItem.setTitle(R.string.menu_unblock_contact); + if (mIsBlacklistingEnabled) { + blockMenuItem.setVisible(true); + if (mBlockContactHelper.isContactBlacklisted()) { + blockMenuItem.setTitle(R.string.menu_unblock_contact); + } else { + blockMenuItem.setTitle(R.string.menu_block_contact); + } } else { - blockMenuItem.setTitle(R.string.menu_block_contact); + blockMenuItem.setVisible(false); } return true; |