diff options
| author | Jay Shrauner <shrauner@google.com> | 2013-09-09 19:58:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-09 19:58:55 +0000 |
| commit | 13a58c385fee3cea2840e0835755da107ac5b8de (patch) | |
| tree | d27ba4d31690008183a49a530b58c21a6ba6f0ae /src | |
| parent | 384473a71867987c0bd22a68de91d879bc3ad8fe (diff) | |
| parent | ba61ecd888c9f46e42f6ef3f4bec7e08f5a00a5f (diff) | |
Merge "Add directory source name to cache" into klp-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/list/RegularSearchListAdapter.java | 12 | ||||
| -rw-r--r-- | src/com/android/dialer/service/CachedNumberLookupService.java | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/dialer/list/RegularSearchListAdapter.java b/src/com/android/dialer/list/RegularSearchListAdapter.java index 627262ebe..58779124e 100644 --- a/src/com/android/dialer/list/RegularSearchListAdapter.java +++ b/src/com/android/dialer/list/RegularSearchListAdapter.java @@ -50,13 +50,11 @@ public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter { final DirectoryPartition partition = (DirectoryPartition) getPartition(partitionIndex); final long directoryId = partition.getDirectoryId(); - if (isExtendedDirectory(directoryId)) { - info.sourceType = CachedContactInfo.SOURCE_TYPE_EXTENDED; - // TODO source_id for extended directory? - } else { - info.sourceType = CachedContactInfo.SOURCE_TYPE_DIRECTORY; - info.sourceId = (int) directoryId; - } + info.sourceName = partition.getLabel(); + info.sourceType = isExtendedDirectory(directoryId) ? + CachedContactInfo.SOURCE_TYPE_EXTENDED : + CachedContactInfo.SOURCE_TYPE_DIRECTORY; + info.sourceId = (int) directoryId; } return info; } diff --git a/src/com/android/dialer/service/CachedNumberLookupService.java b/src/com/android/dialer/service/CachedNumberLookupService.java index 27bf58918..b04593493 100644 --- a/src/com/android/dialer/service/CachedNumberLookupService.java +++ b/src/com/android/dialer/service/CachedNumberLookupService.java @@ -13,6 +13,7 @@ public interface CachedNumberLookupService { public static final int SOURCE_TYPE_PLACES = 3; public static final int SOURCE_TYPE_PROFILE = 4; + public String sourceName; public int sourceType; public int sourceId; public String lookupKey; |