Changing com.android.contacts.R to com.android.dialer.R.

Bug: 6993891
Change-Id: I921ec71fffbd4d4a058bab29ded8a6ac62adfb70

24 files changed, 21 insertions, 27 deletions

diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 56d4f9ccb..cadbb6bc0 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -54,7 +54,6 @@ import android.widget.Toast;
 import com.android.contacts.common.CallUtil;
 import com.android.contacts.ContactPhotoManager;
 import com.android.contacts.ContactsUtils;
-import com.android.contacts.R;
 import com.android.contacts.format.FormatUtils;
 import com.android.contacts.common.ClipboardUtils;
 import com.android.dialer.BackScrollManager.ScrollableHeader;
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index c49e05b31..230c8f48d 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -58,7 +58,6 @@ import android.widget.SearchView.OnQueryTextListener;
 
 import com.android.contacts.common.CallUtil;
 import com.android.contacts.ContactsUtils;
-import com.android.contacts.R;
 import com.android.contacts.activities.TransactionSafeActivity;
 import com.android.contacts.interactions.PhoneNumberInteraction;
 import com.android.contacts.list.ContactListFilterController;
diff --git a/src/com/android/dialer/NonPhoneActivity.java b/src/com/android/dialer/NonPhoneActivity.java
index 101bd58ea..78196a34a 100644
--- a/src/com/android/dialer/NonPhoneActivity.java
+++ b/src/com/android/dialer/NonPhoneActivity.java
@@ -31,7 +31,6 @@ import android.text.TextUtils;
 
 import com.android.contacts.common.CallUtil;
 import com.android.contacts.ContactsActivity;
-import com.android.contacts.R;
 
 /**
  * Activity that intercepts DIAL and VIEW intents for phone numbers for devices that can not
diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java
index e1420d656..d8c522055 100644
--- a/src/com/android/dialer/PhoneCallDetailsHelper.java
+++ b/src/com/android/dialer/PhoneCallDetailsHelper.java
@@ -29,7 +29,6 @@ import android.text.style.StyleSpan;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.contacts.R;
 import com.android.contacts.test.NeededForTesting;
 import com.android.dialer.calllog.CallTypeHelper;
 import com.android.dialer.calllog.PhoneNumberHelper;
diff --git a/src/com/android/dialer/PhoneCallDetailsViews.java b/src/com/android/dialer/PhoneCallDetailsViews.java
index 58246586f..09f50fbe3 100644
--- a/src/com/android/dialer/PhoneCallDetailsViews.java
+++ b/src/com/android/dialer/PhoneCallDetailsViews.java
@@ -20,7 +20,6 @@ import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.contacts.R;
 import com.android.dialer.calllog.CallTypeIconsView;
 
 /**
diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 79d499dfc..32e40c25f 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -35,7 +35,6 @@ import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.android.contacts.R;
 import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
 import com.android.internal.telephony.ITelephony;
 import com.android.internal.telephony.TelephonyCapabilities;
diff --git a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
index 0763f3ccb..52435aafe 100644
--- a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
+++ b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
@@ -25,8 +25,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.android.contacts.R;
 import com.android.dialer.PhoneCallDetails;
+import com.android.dialer.R;
 
 /**
  * Adapter for a ListView containing history items from the details of a call.
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 720cc11d4..1899bc59e 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -33,10 +33,10 @@ import android.view.ViewTreeObserver;
 
 import com.android.common.widget.GroupingListAdapter;
 import com.android.contacts.ContactPhotoManager;
-import com.android.contacts.R;
 import com.android.contacts.util.UriUtils;
 import com.android.dialer.PhoneCallDetails;
 import com.android.dialer.PhoneCallDetailsHelper;
+import com.android.dialer.R;
 import com.android.dialer.util.ExpirableCache;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Objects;
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index af32ef8f4..60471549e 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -46,9 +46,9 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.android.common.io.MoreCloseables;
-import com.android.contacts.common.CallUtil;
 import com.android.contacts.ContactsUtils;
-import com.android.contacts.R;
+import com.android.contacts.common.CallUtil;
+import com.android.dialer.R;
 import com.android.dialer.util.EmptyLoader;
 import com.android.dialer.voicemail.VoicemailStatusHelper;
 import com.android.dialer.voicemail.VoicemailStatusHelper.StatusMessage;
diff --git a/src/com/android/dialer/calllog/CallLogListItemHelper.java b/src/com/android/dialer/calllog/CallLogListItemHelper.java
index 101ca7de3..20b30b1ee 100644
--- a/src/com/android/dialer/calllog/CallLogListItemHelper.java
+++ b/src/com/android/dialer/calllog/CallLogListItemHelper.java
@@ -21,9 +21,9 @@ import android.provider.CallLog.Calls;
 import android.text.TextUtils;
 import android.view.View;
 
-import com.android.contacts.R;
 import com.android.dialer.PhoneCallDetails;
 import com.android.dialer.PhoneCallDetailsHelper;
+import com.android.dialer.R;
 
 /**
  * Helper class to fill in the views of a call log entry.
diff --git a/src/com/android/dialer/calllog/CallLogListItemViews.java b/src/com/android/dialer/calllog/CallLogListItemViews.java
index ac6ad955e..d012f9ceb 100644
--- a/src/com/android/dialer/calllog/CallLogListItemViews.java
+++ b/src/com/android/dialer/calllog/CallLogListItemViews.java
@@ -22,9 +22,9 @@ import android.widget.ImageView;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
 
-import com.android.contacts.R;
 import com.android.contacts.test.NeededForTesting;
 import com.android.dialer.PhoneCallDetailsViews;
+import com.android.dialer.R;
 
 /**
  * Simple value object containing the various views within a call log entry.
diff --git a/src/com/android/dialer/calllog/CallTypeHelper.java b/src/com/android/dialer/calllog/CallTypeHelper.java
index 255258e01..0f9b737f7 100644
--- a/src/com/android/dialer/calllog/CallTypeHelper.java
+++ b/src/com/android/dialer/calllog/CallTypeHelper.java
@@ -19,7 +19,7 @@ package com.android.dialer.calllog;
 import android.content.res.Resources;
 import android.provider.CallLog.Calls;
 
-import com.android.contacts.R;
+import com.android.dialer.R;
 
 /**
  * Helper class to perform operations related to call types.
diff --git a/src/com/android/dialer/calllog/CallTypeIconsView.java b/src/com/android/dialer/calllog/CallTypeIconsView.java
index e26d5a1bb..b83c1493c 100644
--- a/src/com/android/dialer/calllog/CallTypeIconsView.java
+++ b/src/com/android/dialer/calllog/CallTypeIconsView.java
@@ -23,8 +23,8 @@ import android.provider.CallLog.Calls;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.android.contacts.R;
 import com.android.contacts.test.NeededForTesting;
+import com.android.dialer.R;
 import com.google.common.collect.Lists;
 
 import java.util.List;
diff --git a/src/com/android/dialer/calllog/ClearCallLogDialog.java b/src/com/android/dialer/calllog/ClearCallLogDialog.java
index e91c08fa8..1f5b2b3b7 100644
--- a/src/com/android/dialer/calllog/ClearCallLogDialog.java
+++ b/src/com/android/dialer/calllog/ClearCallLogDialog.java
@@ -28,7 +28,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.CallLog.Calls;
 
-import com.android.contacts.R;
+import com.android.dialer.R;
 
 /**
  * Dialog that clears the call log after confirming with the user
diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index ff4e5eeb5..e551e6044 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -32,8 +32,8 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.common.io.MoreCloseables;
-import com.android.contacts.R;
 import com.android.dialer.CallDetailActivity;
+import com.android.dialer.R;
 import com.google.common.collect.Maps;
 
 import java.util.Map;
diff --git a/src/com/android/dialer/calllog/PhoneNumberHelper.java b/src/com/android/dialer/calllog/PhoneNumberHelper.java
index 70505eebc..f0b3701e3 100644
--- a/src/com/android/dialer/calllog/PhoneNumberHelper.java
+++ b/src/com/android/dialer/calllog/PhoneNumberHelper.java
@@ -20,7 +20,7 @@ import android.content.res.Resources;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
-import com.android.contacts.R;
+import com.android.dialer.R;
 import com.android.internal.telephony.CallerInfo;
 
 /**
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 7aa5a9ef4..014f188c6 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -67,12 +67,12 @@ import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-import com.android.contacts.common.CallUtil;
 import com.android.contacts.ContactsUtils;
-import com.android.contacts.R;
+import com.android.contacts.common.CallUtil;
 import com.android.contacts.util.PhoneNumberFormatter;
 import com.android.contacts.util.StopWatch;
 import com.android.dialer.DialtactsActivity;
+import com.android.dialer.R;
 import com.android.dialer.SpecialCharSequenceMgr;
 import com.android.internal.telephony.ITelephony;
 import com.android.phone.common.CallLogAsync;
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 157e82fb1..e7ef808d4 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -47,7 +47,6 @@ import android.widget.TextView;
 
 import com.android.contacts.ContactPhotoManager;
 import com.android.contacts.ContactTileLoaderFactory;
-import com.android.contacts.R;
 import com.android.contacts.dialog.ClearFrequentsDialog;
 import com.android.contacts.interactions.ImportExportDialogFragment;
 import com.android.contacts.list.ContactListFilter;
@@ -58,6 +57,7 @@ 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;
 
 /**
  * Fragment for Phone UI's favorite screen.
diff --git a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
index 8e2339961..853b36efc 100644
--- a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
@@ -25,10 +25,10 @@ import android.widget.BaseAdapter;
 import android.widget.FrameLayout;
 import android.widget.SectionIndexer;
 
-import com.android.contacts.R;
 import com.android.contacts.list.ContactEntryListAdapter;
 import com.android.contacts.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
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java b/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java
index 70580badc..8a98d47df 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java
@@ -40,8 +40,8 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.android.common.io.MoreCloseables;
-import com.android.contacts.R;
 import com.android.dialer.ProximitySensorAware;
+import com.android.dialer.R;
 import com.android.dialer.util.AsyncTaskExecutors;
 import com.android.ex.variablespeed.MediaPlayerProxy;
 import com.android.ex.variablespeed.VariableSpeed;
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
index c87e6778a..ef29f1397 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -30,7 +30,7 @@ import android.os.PowerManager;
 import android.view.View;
 import android.widget.SeekBar;
 
-import com.android.contacts.R;
+import com.android.dialer.R;
 import com.android.dialer.util.AsyncTaskExecutor;
 import com.android.ex.variablespeed.MediaPlayerProxy;
 import com.android.ex.variablespeed.SingleThreadedMediaPlayerProxy;
diff --git a/src/com/android/dialer/voicemail/VoicemailStatusHelperImpl.java b/src/com/android/dialer/voicemail/VoicemailStatusHelperImpl.java
index 3a08e2bff..284b8361e 100644
--- a/src/com/android/dialer/voicemail/VoicemailStatusHelperImpl.java
+++ b/src/com/android/dialer/voicemail/VoicemailStatusHelperImpl.java
@@ -28,8 +28,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.VoicemailContract.Status;
 
-import com.android.contacts.R;
 import com.android.contacts.util.UriUtils;
+import com.android.dialer.R;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
index f4534320f..67132fd45 100644
--- a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
@@ -37,9 +37,9 @@ import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.dialer.CallDetailActivity;
-import com.android.contacts.R;
 import com.android.contacts.common.test.FragmentTestActivity;
+import com.android.dialer.CallDetailActivity;
+import com.android.dialer.R;
 import com.android.internal.telephony.CallerInfo;
 
 import java.util.Date;
diff --git a/tests/src/com/android/dialer/voicemail/VoicemailStatusHelperImplTest.java b/tests/src/com/android/dialer/voicemail/VoicemailStatusHelperImplTest.java
index 2e75d1d01..03776440f 100644
--- a/tests/src/com/android/dialer/voicemail/VoicemailStatusHelperImplTest.java
+++ b/tests/src/com/android/dialer/voicemail/VoicemailStatusHelperImplTest.java
@@ -34,7 +34,7 @@ import android.net.Uri;
 import android.provider.VoicemailContract.Status;
 import android.test.AndroidTestCase;
 
-import com.android.contacts.R;
+import com.android.dialer.R;
 import com.android.dialer.voicemail.VoicemailStatusHelper.StatusMessage;
 
 import java.util.List;