Merge "Moving ContactListItemView and dependent classes."
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 7154a12..12b29a8 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -58,15 +58,15 @@
import com.android.contacts.common.CallUtil;
import com.android.contacts.common.activity.TransactionSafeActivity;
-import com.android.dialer.interactions.PhoneNumberInteraction;
+import com.android.contacts.common.list.ContactListItemView;
import com.android.contacts.list.ContactListFilterController;
import com.android.contacts.list.ContactListFilterController.ContactListFilterListener;
-import com.android.contacts.list.ContactListItemView;
import com.android.contacts.list.OnPhoneNumberPickerActionListener;
import com.android.contacts.list.PhoneNumberPickerFragment;
import com.android.contacts.util.AccountFilterUtil;
import com.android.dialer.calllog.CallLogFragment;
import com.android.dialer.dialpad.DialpadFragment;
+import com.android.dialer.interactions.PhoneNumberInteraction;
import com.android.dialer.list.PhoneFavoriteFragment;
import com.android.dialer.util.OrientationUtil;
import com.android.internal.telephony.ITelephony;
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index ac8fcb6..a82acb8 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -48,14 +48,14 @@
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.ContactTileLoaderFactory;
import com.android.contacts.common.dialog.ClearFrequentsDialog;
+import com.android.contacts.common.list.ContactListFilter;
+import com.android.contacts.common.list.ContactListItemView;
+import com.android.contacts.common.preference.ContactsPreferences;
import com.android.contacts.interactions.ImportExportDialogFragment;
-import com.android.contacts.list.ContactListFilter;
import com.android.contacts.list.ContactListFilterController;
-import com.android.contacts.list.ContactListItemView;
import com.android.contacts.list.ContactTileAdapter;
import com.android.contacts.list.ContactTileView;
import com.android.contacts.list.PhoneNumberListAdapter;
-import com.android.contacts.preference.ContactsPreferences;
import com.android.contacts.util.AccountFilterUtil;
import com.android.dialer.R;
diff --git a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
index 853b36e..6b85c0c 100644
--- a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
@@ -25,14 +25,14 @@
import android.widget.FrameLayout;
import android.widget.SectionIndexer;
-import com.android.contacts.list.ContactEntryListAdapter;
-import com.android.contacts.list.ContactListItemView;
+import com.android.contacts.common.list.ContactEntryListAdapter;
+import com.android.contacts.common.list.ContactListItemView;
import com.android.contacts.list.ContactTileAdapter;
import com.android.dialer.R;
/**
* An adapter that combines items from {@link com.android.contacts.list.ContactTileAdapter} and
- * {@link com.android.contacts.list.ContactEntryListAdapter} into a single list. In between those two results,
+ * {@link com.android.contacts.common.list.ContactEntryListAdapter} into a single list. In between those two results,
* an account filter header will be inserted.
*/
public class PhoneFavoriteMergedAdapter extends BaseAdapter implements SectionIndexer {
