diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-27 06:48:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-27 06:48:42 +0000 |
| commit | a5d08ac16fcf39bb0df9cf72ee938a6e0c52b4b7 (patch) | |
| tree | 8b8973ad9e7972025d687687307ea14c63b4321f | |
| parent | aef5d068e59b2b9a4f609dc887c7887639436b5d (diff) | |
| parent | cb2a981d7f948f24c451a18f47fdbb12177f0ebd (diff) | |
Merge "Switch setLabel and setLocation"
| -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) |