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/StatusBarNotifier.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/StatusBarNotifier.java')
| -rw-r--r-- | java/com/android/incallui/StatusBarNotifier.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java index 1d73fe8e7..8316d76ee 100644 --- a/java/com/android/incallui/StatusBarNotifier.java +++ b/java/com/android/incallui/StatusBarNotifier.java @@ -64,12 +64,11 @@ import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.ContactsUtils.UserType; -import com.android.contacts.common.preference.ContactsPreferences; -import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.configprovider.ConfigProviderComponent; import com.android.dialer.contactphoto.BitmapUtil; +import com.android.dialer.contacts.ContactsComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.enrichedcall.Session; import com.android.dialer.lettertile.LetterTileDrawable; @@ -121,7 +120,6 @@ public class StatusBarNotifier private final Context context; private final ContactInfoCache contactInfoCache; private final DialerRingtoneManager dialerRingtoneManager; - @Nullable private ContactsPreferences contactsPreferences; private int currentNotification = NOTIFICATION_NONE; private int callState = DialerCallState.INVALID; private int videoState = VideoProfile.STATE_AUDIO_ONLY; @@ -136,7 +134,6 @@ public class StatusBarNotifier public StatusBarNotifier(@NonNull Context context, @NonNull ContactInfoCache contactInfoCache) { Trace.beginSection("StatusBarNotifier.Constructor"); this.context = Assert.isNotNull(context); - contactsPreferences = ContactsPreferencesFactory.newContactsPreferences(this.context); this.contactInfoCache = contactInfoCache; dialerRingtoneManager = new DialerRingtoneManager( @@ -565,8 +562,9 @@ public class StatusBarNotifier } String preferredName = - ContactDisplayUtils.getPreferredDisplayName( - contactInfo.namePrimary, contactInfo.nameAlternative, contactsPreferences); + ContactsComponent.get(context) + .contactDisplayPreferences() + .getDisplayName(contactInfo.namePrimary, contactInfo.nameAlternative); if (TextUtils.isEmpty(preferredName)) { return TextUtils.isEmpty(contactInfo.number) ? null |