commit cebeb3ce603111f5a82291323094338aef8c20c5
author Chiao Cheng <chiaocheng@google.com> Tue Nov 13 11:31:51 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 13 11:31:51 2012 -0800
tree 37dbc1cf5c3f9651abc47f032355f54c70ad324b
parent 1d3e4209933247ee697421a94fb612198b4003ce
parent c2d8df96c034e25d9e2dc1f73506d554bca8935c

Merge "Further clean-up of PhoneFavoriteFragment."

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

diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index a82acb8..385e1d1 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -50,12 +50,12 @@
 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.list.ContactTileAdapter;
+import com.android.contacts.common.list.ContactTileView;
+import com.android.contacts.common.list.PhoneNumberListAdapter;
 import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.interactions.ImportExportDialogFragment;
 import com.android.contacts.list.ContactListFilterController;
-import com.android.contacts.list.ContactTileAdapter;
-import com.android.contacts.list.ContactTileView;
-import com.android.contacts.list.PhoneNumberListAdapter;
 import com.android.contacts.util.AccountFilterUtil;
 import com.android.dialer.R;
 
@@ -63,8 +63,8 @@
  * Fragment for Phone UI's favorite screen.
  *
  * This fragment contains three kinds of contacts in one screen: "starred", "frequent", and "all"
- * contacts. To show them at once, this merges results from {@link com.android.contacts.list.ContactTileAdapter} and
- * {@link com.android.contacts.list.PhoneNumberListAdapter} into one unified list using {@link PhoneFavoriteMergedAdapter}.
+ * contacts. To show them at once, this merges results from {@link com.android.contacts.common.list.ContactTileAdapter} and
+ * {@link com.android.contacts.common.list.PhoneNumberListAdapter} into one unified list using {@link PhoneFavoriteMergedAdapter}.
  * A contact filter header is also inserted between those adapters' results.
  */
 public class PhoneFavoriteFragment extends Fragment implements OnItemClickListener {

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

diff --git a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
index 6b85c0c..aa5ded5 100644
--- a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
@@ -27,11 +27,11 @@
 
 import com.android.contacts.common.list.ContactEntryListAdapter;
 import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.list.ContactTileAdapter;
+import com.android.contacts.common.list.ContactTileAdapter;
 import com.android.dialer.R;
 
 /**
- * An adapter that combines items from {@link com.android.contacts.list.ContactTileAdapter} and
+ * An adapter that combines items from {@link com.android.contacts.common.list.ContactTileAdapter} and
  * {@link com.android.contacts.common.list.ContactEntryListAdapter} into a single list. In between those two results,
  * an account filter header will be inserted.
  */