diff options
| author | Ta-wei Yen <twyen@google.com> | 2015-11-04 01:46:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-11-04 01:46:03 +0000 |
| commit | 26072c733ba61f6cbbdfb40808fb6a700af8e1f7 (patch) | |
| tree | e5288ca6c0be43b8c8d90ee1a2bb7786d1957bcb | |
| parent | 85dce1ce13a349c51e3dc35a2a68f6b9d9ae44ab (diff) | |
| parent | 0bdadcc8abbc2531b8dcd55ede4aeb89baf312fb (diff) | |
Merge "Remove "Blocked Caller" Avatar in call detail" into ub-contactsdialer-a-dev
| -rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index ab63ddc21..0d943e055 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -161,7 +161,8 @@ public class CallDetailActivity extends AppCompatActivity mHistoryList.setAdapter( new CallDetailHistoryAdapter(mContext, mInflater, mCallTypeHelper, details)); - updatePhotoAndBlockActionItem(); + updateFilteredNumberChanges(); + updateContactPhoto(); findViewById(R.id.call_detail).setVisibility(View.VISIBLE); } @@ -380,15 +381,15 @@ public class CallDetailActivity extends AppCompatActivity @Override public void onChangeFilteredNumberSuccess() { - updatePhotoAndBlockActionItem(); + updateFilteredNumberChanges(); } @Override public void onChangeFilteredNumberUndo() { - updatePhotoAndBlockActionItem(); + updateFilteredNumberChanges(); } - private void updatePhotoAndBlockActionItem() { + private void updateFilteredNumberChanges() { if (mDetails == null || !FilteredNumbersUtil.canBlockNumber(this, mNumber, mDetails.countryIso)) { return; @@ -399,14 +400,11 @@ public class CallDetailActivity extends AppCompatActivity @Override public void onCheckComplete(Integer id) { mBlockedNumberId = id; - - updateContactPhoto(); updateBlockActionItem(); } }, mNumber, mDetails.countryIso); if (!success) { - updateContactPhoto(); updateBlockActionItem(); } } @@ -417,11 +415,6 @@ public class CallDetailActivity extends AppCompatActivity return; } - if (mBlockedNumberId != null) { - mQuickContactBadge.setImageDrawable(mContext.getDrawable(R.drawable.blocked_contact)); - return; - } - final boolean isVoicemailNumber = PhoneNumberUtil.isVoicemailNumber(mContext, mDetails.accountHandle, mNumber); final boolean isBusiness = mContactInfoHelper.isBusiness(mDetails.sourceType); |