diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-05-05 15:23:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 15:23:13 +0000 |
| commit | 300a8683b9c28424fb0f0c571a0abe128c461f69 (patch) | |
| tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/contacts/common/dialog/CallSubjectDialog.java | |
| parent | d67f1627521b174f12e0c247f154c7c93c5e408e (diff) | |
| parent | 10b34a5ebf12e97ecba0caf3c8e30b476b038a96 (diff) | |
Update Dialer to V10 RC16
am: 10b34a5ebf
Change-Id: Iea3e96ccdeaf1fa796ceca702cace82ca20f298c
Diffstat (limited to 'java/com/android/contacts/common/dialog/CallSubjectDialog.java')
| -rw-r--r-- | java/com/android/contacts/common/dialog/CallSubjectDialog.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java index 117ac5e4e..0e7937102 100644 --- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java +++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java @@ -330,10 +330,12 @@ public class CallSubjectDialog extends Activity { mContactPhoto.setVisibility(View.GONE); } mNameView.setText(mNameOrNumber); - if (!TextUtils.isEmpty(mNumberLabel) && !TextUtils.isEmpty(mDisplayNumber)) { + if (!TextUtils.isEmpty(mDisplayNumber)) { mNumberView.setVisibility(View.VISIBLE); mNumberView.setText( - getString(R.string.call_subject_type_and_number, mNumberLabel, mDisplayNumber)); + TextUtils.isEmpty(mNumberLabel) + ? mDisplayNumber + : getString(R.string.call_subject_type_and_number, mNumberLabel, mDisplayNumber)); } else { mNumberView.setVisibility(View.GONE); mNumberView.setText(null); |