diff options
| author | Andrew Lee <anwlee@google.com> | 2015-10-12 22:20:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-12 22:20:30 +0000 |
| commit | b01520f92d03560d6f5423875db06a515d3455a7 (patch) | |
| tree | aa652a42ced1f9fdf94f08e89db64f8821436733 /src/com/android/dialer | |
| parent | f49c817d525ca3f3a85ccea10f8e94d397c7feb5 (diff) | |
| parent | f549abc92a680f31b4b210705e03428aa0d7c040 (diff) | |
Merge "Show icons for call detail actions." into ub-contactsdialer-a-dev
Diffstat (limited to 'src/com/android/dialer')
| -rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 10 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/CallTypeIconsView.java | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index 73622bf9b..696168a8f 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -229,8 +229,7 @@ public class CallDetailActivity extends AppCompatActivity private TextView mAccountLabel; private View mCallButton; - private View mBlockNumberActionItem; - private TextView mBlockNumberActionItemText; + private TextView mBlockNumberActionItem; private View mEditBeforeCallActionItem; private View mReportActionItem; @@ -284,9 +283,8 @@ public class CallDetailActivity extends AppCompatActivity } }); - mBlockNumberActionItem = findViewById(R.id.call_detail_action_block); + mBlockNumberActionItem = (TextView) findViewById(R.id.call_detail_action_block); mBlockNumberActionItem.setOnClickListener(this); - mBlockNumberActionItemText = (TextView) findViewById(R.id.call_detail_action_block_text); mEditBeforeCallActionItem = findViewById(R.id.call_detail_action_edit_before_call); mEditBeforeCallActionItem.setOnClickListener(this); mReportActionItem = findViewById(R.id.call_detail_action_report); @@ -443,9 +441,9 @@ public class CallDetailActivity extends AppCompatActivity public void onCheckComplete(Integer id) { mBlockedNumberId = id; if (mBlockedNumberId == null) { - mBlockNumberActionItemText.setText(R.string.action_block_number); + mBlockNumberActionItem.setText(R.string.action_block_number); } else { - mBlockNumberActionItemText.setText(R.string.action_unblock_number); + mBlockNumberActionItem.setText(R.string.action_unblock_number); } mBlockNumberActionItem.setVisibility(View.VISIBLE); diff --git a/src/com/android/dialer/calllog/CallTypeIconsView.java b/src/com/android/dialer/calllog/CallTypeIconsView.java index d2be380a5..cfd8f9748 100644 --- a/src/com/android/dialer/calllog/CallTypeIconsView.java +++ b/src/com/android/dialer/calllog/CallTypeIconsView.java @@ -199,7 +199,7 @@ public class CallTypeIconsView extends View { voicemail = r.getDrawable(R.drawable.ic_call_voicemail_holo_dark); - blocked = getScaledBitmap(context, R.drawable.ic_block_18dp); + blocked = getScaledBitmap(context, R.drawable.ic_block_24dp); blocked.setColorFilter(r.getColor(R.color.blocked_call), PorterDuff.Mode.MULTIPLY); videoCall = getScaledBitmap(context, R.drawable.ic_videocam_24dp); |