diff options
Diffstat (limited to 'src/com/android/dialer/list')
-rw-r--r-- | src/com/android/dialer/list/RegularSearchFragment.java | 2 | ||||
-rw-r--r-- | src/com/android/dialer/list/RegularSearchListAdapter.java | 24 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/com/android/dialer/list/RegularSearchFragment.java b/src/com/android/dialer/list/RegularSearchFragment.java index 2a80b3ebd..21c8c3155 100644 --- a/src/com/android/dialer/list/RegularSearchFragment.java +++ b/src/com/android/dialer/list/RegularSearchFragment.java @@ -49,7 +49,7 @@ public class RegularSearchFragment extends SearchFragment { final RegularSearchListAdapter adapter = (RegularSearchListAdapter) getAdapter(); mCachedNumberLookupService.addContact(getContext(), - adapter.getContactInfo(position)); + adapter.getContactInfo(mCachedNumberLookupService, position)); } } } diff --git a/src/com/android/dialer/list/RegularSearchListAdapter.java b/src/com/android/dialer/list/RegularSearchListAdapter.java index 05af3c7ff..d0617b7dc 100644 --- a/src/com/android/dialer/list/RegularSearchListAdapter.java +++ b/src/com/android/dialer/list/RegularSearchListAdapter.java @@ -23,6 +23,8 @@ import android.text.TextUtils; import com.android.contacts.common.list.DirectoryPartition; import com.android.contacts.common.list.PhoneNumberListAdapter; +import com.android.dialer.calllog.ContactInfo; +import com.android.dialer.service.CachedNumberLookupService; import com.android.dialer.service.CachedNumberLookupService.CachedContactInfo; /** @@ -34,8 +36,10 @@ public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter { super(context); } - public CachedContactInfo getContactInfo(int position) { - CachedContactInfo info = new CachedContactInfo(); + public CachedContactInfo getContactInfo( + CachedNumberLookupService lookupService, int position) { + ContactInfo info = new ContactInfo(); + CachedContactInfo cacheInfo = lookupService.buildCachedContactInfo(info); final Cursor item = (Cursor) getItem(position); if (item != null) { info.name = item.getString(PhoneQuery.DISPLAY_NAME); @@ -44,19 +48,21 @@ public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter { info.number = item.getString(PhoneQuery.PHONE_NUMBER); final String photoUriStr = item.getString(PhoneQuery.PHOTO_URI); info.photoUri = photoUriStr == null ? null : Uri.parse(photoUriStr); - info.lookupKey = item.getString(PhoneQuery.LOOKUP_KEY); + + cacheInfo.setLookupKey(item.getString(PhoneQuery.LOOKUP_KEY)); final int partitionIndex = getPartitionForPosition(position); final DirectoryPartition partition = (DirectoryPartition) getPartition(partitionIndex); final long directoryId = partition.getDirectoryId(); - info.sourceName = partition.getLabel(); - info.sourceType = isExtendedDirectory(directoryId) ? - CachedContactInfo.SOURCE_TYPE_EXTENDED : - CachedContactInfo.SOURCE_TYPE_DIRECTORY; - info.sourceId = (int) directoryId; + final String sourceName = partition.getLabel(); + if (isExtendedDirectory(directoryId)) { + cacheInfo.setExtendedSource(sourceName, directoryId); + } else { + cacheInfo.setDirectorySource(sourceName, directoryId); + } } - return info; + return cacheInfo; } @Override |