Merge "Remove the work badge icon for Google caller id in call log" into ub-contactsdialer-b-dev (84674fbb) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/calllog/ContactInfo.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ public class ContactInfo {
		.add("type", type).add("label", label)
		.add("number", number).add("formattedNumber",formattedNumber)
		.add("normalizedNumber", normalizedNumber).add("photoId", photoId)
		.add("photoUri", photoUri).add("objectId", objectId).toString();
		.add("photoUri", photoUri).add("objectId", objectId)
		.add("userType",userType).toString();
		}
		}

src/com/android/dialer/list/RegularSearchListAdapter.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter {
		final DirectoryPartition partition =
		(DirectoryPartition) getPartition(getPartitionForPosition(position));
		final long directoryId = partition.getDirectoryId();
		final boolean isExtendedDirectory = isExtendedDirectory(directoryId);

		info.name = item.getString(PhoneQuery.DISPLAY_NAME);
		info.type = item.getInt(PhoneQuery.PHONE_TYPE);
		@@ -57,13 +58,22 @@ 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.userType = DirectoryCompat.isEnterpriseDirectoryId(directoryId)
		/*
		* An extended directory is custom directory in the app, but not a directory provided by
		* framework. So it can't be USER_TYPE_WORK.
		*
		* When a search result is selected, RegularSearchFragment calls getContactInfo and
		* cache the resulting @{link ContactInfo} into local db. Set usertype to USER_TYPE_WORK
		* only if it's NOT extended directory id and is enterprise directory.
		*/
		info.userType = !isExtendedDirectory
		&& DirectoryCompat.isEnterpriseDirectoryId(directoryId)
		? ContactsUtils.USER_TYPE_WORK : ContactsUtils.USER_TYPE_CURRENT;

		cacheInfo.setLookupKey(item.getString(PhoneQuery.LOOKUP_KEY));

		final String sourceName = partition.getLabel();
		if (isExtendedDirectory(directoryId)) {
		if (isExtendedDirectory) {
		cacheInfo.setExtendedSource(sourceName, directoryId);
		} else {
		cacheInfo.setDirectorySource(sourceName, directoryId);