diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-05-05 15:29:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 15:29:54 +0000 |
| commit | 43b3152d075138b11e1fe297682b3bbc775e5641 (patch) | |
| tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java | |
| parent | 2034759538273aed8a0b412d8fb90994eba1f7ea (diff) | |
| parent | 300a8683b9c28424fb0f0c571a0abe128c461f69 (diff) | |
Update Dialer to V10 RC16 am: 10b34a5ebf
am: 300a8683b9
Change-Id: If5695bad59f8a4dab6e6c90b54943b900bd2652a
Diffstat (limited to 'java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java')
| -rw-r--r-- | java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java index 437c2602c..4d9aacf7b 100644 --- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java @@ -70,14 +70,15 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder contactPhoto.setContentDescription( context.getString(R.string.description_contact_photo_details, contact.getNameOrNumber())); nameView.setText(contact.getNameOrNumber()); - if (!TextUtils.isEmpty(contact.getNumberLabel()) - && !TextUtils.isEmpty(contact.getDisplayNumber())) { + if (!TextUtils.isEmpty(contact.getDisplayNumber())) { numberView.setVisibility(View.VISIBLE); String secondaryInfo = - context.getString( - com.android.contacts.common.R.string.call_subject_type_and_number, - contact.getNumberLabel(), - contact.getDisplayNumber()); + TextUtils.isEmpty(contact.getNumberLabel()) + ? contact.getDisplayNumber() + : context.getString( + com.android.contacts.common.R.string.call_subject_type_and_number, + contact.getNumberLabel(), + contact.getDisplayNumber()); numberView.setText(secondaryInfo); } else { numberView.setVisibility(View.GONE); |