commit 1d47c42698a4c9476b8b6b53daff89529b9c6212
author Jeff Davidson <jpd@google.com> Mon Jun 23 22:40:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 23 21:44:43 2014 +0000
tree 670a4255e5d270a02a00e94ccd76b92624fcc810
parent b5f10d3dab09850fefce6d85f1e9d73f66cde5c3
parent fc6ed03fb6bd06cd0e0865d1e8a8cb065d5511f8

Merge "Fix broken R references in Dialer."

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

diff --git a/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java b/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java
index 776a7a2..5f88776 100644
--- a/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java
@@ -23,8 +23,8 @@
 import android.widget.ImageButton;
 import android.widget.TextView;
 
-import com.android.contacts.common.R;
 import com.android.contacts.common.list.ContactEntry;
+import com.android.dialer.R;
 
 /**
  * Displays the contact's picture overlaid with their name and number type in a tile.

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

diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
index c4ff0b0..c289aa8 100644
--- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
@@ -37,10 +37,10 @@
 
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactTileLoaderFactory;
-import com.android.contacts.common.R;
 import com.android.contacts.common.list.ContactEntry;
 import com.android.contacts.common.list.ContactTileAdapter.DisplayType;
 import com.android.contacts.common.list.ContactTileView;
+import com.android.dialer.R;
 
 import java.util.ArrayList;
 import java.util.Comparator;