summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2014-06-23 22:40:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-23 21:44:43 +0000
commit1d47c42698a4c9476b8b6b53daff89529b9c6212 (patch)
tree670a4255e5d270a02a00e94ccd76b92624fcc810
parentb5f10d3dab09850fefce6d85f1e9d73f66cde5c3 (diff)
parentfc6ed03fb6bd06cd0e0865d1e8a8cb065d5511f8 (diff)
Merge "Fix broken R references in Dialer."
-rw-r--r--src/com/android/dialer/list/PhoneFavoriteSquareTileView.java2
-rw-r--r--src/com/android/dialer/list/PhoneFavoritesTileAdapter.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java b/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java
index 776a7a2cf..5f8877616 100644
--- a/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java
@@ -23,8 +23,8 @@ import android.view.View;
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.
diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
index c4ff0b07b..c289aa8b1 100644
--- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
@@ -37,10 +37,10 @@ import android.widget.FrameLayout;
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;