diff options
| author | twyen <twyen@google.com> | 2018-03-27 06:54:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-27 06:54:19 +0000 |
| commit | ca1e5d1daa493e9dab2aa38e9f3f99a46faf4913 (patch) | |
| tree | 8b8973ad9e7972025d687687307ea14c63b4321f | |
| parent | 88bc8981da17f0d9d80649948d904171b334fad7 (diff) | |
| parent | a5d08ac16fcf39bb0df9cf72ee938a6e0c52b4b7 (diff) | |
Merge "Switch setLabel and setLocation"
am: a5d08ac16f
Change-Id: I7ed73c9ba433191407e3eea9aa00123397b2977e
| -rw-r--r-- | java/com/android/incallui/CallCardPresenter.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index 49f819bab..316b6cca0 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -768,12 +768,11 @@ public class CallCardPresenter .setNumber(number) .setName(primary.updateNameIfRestricted(name)) .setNameIsNumber(nameIsNumber) - .setLabel( + .setLocation( shouldShowLocationAsLabel(nameIsNumber, primaryContactInfo.shouldShowLocation) ? primaryContactInfo.location : null) - .setLocation( - isChildNumberShown || isCallSubjectShown ? null : primaryContactInfo.label) + .setLabel(isChildNumberShown || isCallSubjectShown ? null : primaryContactInfo.label) .setPhoto(primaryContactInfo.photo) .setPhotoType(primaryContactInfo.photoType) .setIsSipCall(primaryContactInfo.isSipCall) |