Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 848f23a1 authored by linyuh's avatar linyuh Committed by android-build-merger
Browse files

Merge "Move DirectoryCompat from "contacts/common" to "dialer/common/cp2"." am: 79eb6bd9 

am: 67e3cbd5

Change-Id: I9833e7b15740418b1e19d36a8d4e0aa565dcfcab
parents a4c3f8f1 67e3cbd5

java/com/android/contacts/common/ContactsUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.contacts.common; 


import android.provider.ContactsContract.Contacts;

import android.support.annotation.IntDef;

import com.android.contacts.common.compat.DirectoryCompat;

import com.android.dialer.common.cp2.DirectoryCompat;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

java/com/android/contacts/common/list/ContactEntryListAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ import android.widget.SectionIndexer; 
import android.widget.TextView;

import com.android.contacts.common.ContactsUtils;

import com.android.contacts.common.R;

import com.android.contacts.common.compat.DirectoryCompat;

import com.android.contacts.common.util.SearchUtil;

import com.android.dialer.common.LogUtil;

import com.android.dialer.common.cp2.DirectoryCompat;

import com.android.dialer.compat.CompatUtils;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.contactphoto.ContactPhotoManager;

java/com/android/contacts/common/list/DirectoryListLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import android.os.Handler; 
import android.provider.ContactsContract.Directory;

import android.text.TextUtils;

import com.android.contacts.common.R;

import com.android.contacts.common.compat.DirectoryCompat;

import com.android.dialer.common.LogUtil;

import com.android.dialer.common.cp2.DirectoryCompat;

import com.android.dialer.util.PermissionsUtil;



/** A specialized loader for the list of directories, see {@link Directory}. */

java/com/android/contacts/common/list/PhoneNumberListAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ import android.view.ViewGroup; 
import com.android.contacts.common.ContactsUtils;

import com.android.contacts.common.R;

import com.android.contacts.common.compat.CallableCompat;

import com.android.contacts.common.compat.DirectoryCompat;

import com.android.contacts.common.compat.PhoneCompat;

import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor;

import com.android.contacts.common.list.ContactListItemView.CallToAction;

import com.android.contacts.common.preference.ContactsPreferences;

import com.android.contacts.common.util.Constants;

import com.android.dialer.common.LogUtil;

import com.android.dialer.common.cp2.DirectoryCompat;

import com.android.dialer.compat.CompatUtils;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;

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

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import android.database.Cursor; 
import android.net.Uri;

import android.text.TextUtils;

import com.android.contacts.common.ContactsUtils;

import com.android.contacts.common.compat.DirectoryCompat;

import com.android.contacts.common.list.DirectoryPartition;

import com.android.dialer.common.cp2.DirectoryCompat;

import com.android.dialer.phonenumbercache.CachedNumberLookupService;

import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;

import com.android.dialer.phonenumbercache.ContactInfo;