diff options
| author | twyen <twyen@google.com> | 2018-06-26 16:04:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-26 16:04:53 -0700 |
| commit | bfd105673cd6eb21a1c207d24169ad9bfe645539 (patch) | |
| tree | 198fcf37848a75c8d68f74679a56fd9dc0f4891b /java/com/android/incallui/ReturnToCallController.java | |
| parent | ee0371753257a3db0cce37f5dffae7ac6ebf34b2 (diff) | |
| parent | f9d508090cbf3b9f85b72241c77f625c152448bc (diff) | |
Merge changes I45374e61,I265dcc61,Id4622886,I09d0df69,I3ea0fb46 am: 2f6900466e am: e6262b0bce
am: f9d508090c
Change-Id: I329713a5083f5ccd632b536e41f466eaef9dc4e2
Diffstat (limited to 'java/com/android/incallui/ReturnToCallController.java')
| -rw-r--r-- | java/com/android/incallui/ReturnToCallController.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java index 94ce8d7af..addde55f0 100644 --- a/java/com/android/incallui/ReturnToCallController.java +++ b/java/com/android/incallui/ReturnToCallController.java @@ -30,9 +30,9 @@ import com.android.bubble.Bubble; import com.android.bubble.BubbleComponent; import com.android.bubble.BubbleInfo; import com.android.bubble.BubbleInfo.Action; -import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.configprovider.ConfigProviderComponent; +import com.android.dialer.contacts.ContactsComponent; import com.android.dialer.lettertile.LetterTileDrawable; import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.theme.base.ThemeComponent; @@ -369,10 +369,9 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio private LetterTileDrawable createLettleTileDrawable( DialerCall dialerCall, ContactCacheEntry entry) { String preferredName = - ContactDisplayUtils.getPreferredDisplayName( - entry.namePrimary, - entry.nameAlternative, - ContactsPreferencesFactory.newContactsPreferences(context)); + ContactsComponent.get(context) + .contactDisplayPreferences() + .getDisplayName(entry.namePrimary, entry.nameAlternative); if (TextUtils.isEmpty(preferredName)) { preferredName = entry.number; } |