Collapse res-aosp and res-icons into res folder for AOSP Contacts (1/2)

bug:31022536
Change-Id: I0434710d92027e59ccd97e27ebd09f1668346684

73 files changed, 62 insertions, 63 deletions

diff --git a/Android.mk b/Android.mk
index a03d671b2..47653cd29 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@ support_library_root_dir := prebuilts/sdk/current/support
 endif
 
 src_dirs := src src-bind $(phone_common_dir)/src
-res_dirs := res res-aosp res-icons $(phone_common_dir)/res
+res_dirs := res $(phone_common_dir)/res
 asset_dirs := assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
diff --git a/res-icons/mipmap-hdpi/ic_contacts_launcher.png b/res/mipmap-hdpi/ic_contacts_launcher.png
index 0fd1492ba..0fd1492ba 100644
--- a/res-icons/mipmap-hdpi/ic_contacts_launcher.png
+++ b/res/mipmap-hdpi/ic_contacts_launcher.png
diff --git a/res-icons/mipmap-mdpi/ic_contacts_launcher.png b/res/mipmap-mdpi/ic_contacts_launcher.png
index e23930b82..e23930b82 100644
--- a/res-icons/mipmap-mdpi/ic_contacts_launcher.png
+++ b/res/mipmap-mdpi/ic_contacts_launcher.png
diff --git a/res-icons/mipmap-xhdpi/ic_contacts_launcher.png b/res/mipmap-xhdpi/ic_contacts_launcher.png
index aff0f3166..aff0f3166 100644
--- a/res-icons/mipmap-xhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xhdpi/ic_contacts_launcher.png
diff --git a/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png b/res/mipmap-xxhdpi/ic_contacts_launcher.png
index 9cd2ebe42..9cd2ebe42 100644
--- a/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xxhdpi/ic_contacts_launcher.png
diff --git a/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png b/res/mipmap-xxxhdpi/ic_contacts_launcher.png
index 74c41792f..74c41792f 100644
--- a/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xxxhdpi/ic_contacts_launcher.png
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 8dd1ba968..aa53a8ad0 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -60,7 +60,6 @@
 
     <dimen name="contact_browser_list_header_left_margin">@dimen/list_visible_scrollbar_padding</dimen>
     <dimen name="contact_browser_list_header_right_margin">24dip</dimen>
-    <dimen name="contact_browser_list_top_margin">16dip</dimen>
 
     <!-- End margin of the account filter header icon -->
     <dimen name="contact_browser_list_header_icon_right_margin">22dp</dimen>
diff --git a/res-aosp/xml/shortcuts.xml b/res/xml/shortcuts.xml
index f28da684e..f28da684e 100644
--- a/res-aosp/xml/shortcuts.xml
+++ b/res/xml/shortcuts.xml
diff --git a/src/com/android/contacts/common/activity/LicenseActivity.java b/src/com/android/contacts/common/activity/LicenseActivity.java
index 9e86ee8e5..7cd761f6f 100644
--- a/src/com/android/contacts/common/activity/LicenseActivity.java
+++ b/src/com/android/contacts/common/activity/LicenseActivity.java
@@ -15,7 +15,7 @@
  */
 package com.android.contacts.common.activity;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
diff --git a/src/com/android/contacts/common/activity/RequestPermissionsActivity.java b/src/com/android/contacts/common/activity/RequestPermissionsActivity.java
index 7e7522312..45a941edb 100644
--- a/src/com/android/contacts/common/activity/RequestPermissionsActivity.java
+++ b/src/com/android/contacts/common/activity/RequestPermissionsActivity.java
@@ -16,7 +16,7 @@
 
 package com.android.contacts.common.activity;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 import android.Manifest.permission;
 import android.app.Activity;
diff --git a/src/com/android/contacts/dialog/CallSubjectDialog.java b/src/com/android/contacts/dialog/CallSubjectDialog.java
index b1a77de7a..413765dac 100644
--- a/src/com/android/contacts/dialog/CallSubjectDialog.java
+++ b/src/com/android/contacts/dialog/CallSubjectDialog.java
@@ -46,7 +46,7 @@ import android.widget.TextView;
 
 import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.compat.PhoneAccountSdkCompat;
 import com.android.contacts.compat.telecom.TelecomManagerCompat;
diff --git a/src/com/android/contacts/dialog/ClearFrequentsDialog.java b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
index 70d766a58..7591de3ff 100644
--- a/src/com/android/contacts/dialog/ClearFrequentsDialog.java
+++ b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
@@ -28,7 +28,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.ContactsContract;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.util.PermissionsUtil;
 
 /**
diff --git a/src/com/android/contacts/editor/SelectAccountDialogFragment.java b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
index 2067f9faa..fe3d9d6eb 100644
--- a/src/com/android/contacts/editor/SelectAccountDialogFragment.java
+++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
@@ -26,7 +26,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.util.AccountsListAdapter;
 import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
diff --git a/src/com/android/contacts/group/GroupMembersAdapter.java b/src/com/android/contacts/group/GroupMembersAdapter.java
index bd5084290..78dae65bd 100644
--- a/src/com/android/contacts/group/GroupMembersAdapter.java
+++ b/src/com/android/contacts/group/GroupMembersAdapter.java
@@ -27,7 +27,7 @@ import android.provider.ContactsContract.Directory;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.list.ContactListItemView;
 import com.android.contacts.list.MultiSelectEntryContactListAdapter;
 import com.android.contacts.preference.ContactsPreferences;
diff --git a/src/com/android/contacts/interactions/ExportDialogFragment.java b/src/com/android/contacts/interactions/ExportDialogFragment.java
index 772bc21ec..c7ce07230 100644
--- a/src/com/android/contacts/interactions/ExportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ExportDialogFragment.java
@@ -38,7 +38,7 @@ import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contacts.vcard.ExportVCardActivity;
 import com.android.contacts.vcard.ShareVCardActivity;
diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
index ff9300ab1..6bbd72e93 100644
--- a/src/com/android/contacts/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -35,7 +35,7 @@ import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
 import com.android.contacts.activities.SimImportActivity;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.database.SimContactDao;
diff --git a/src/com/android/contacts/lettertiles/LetterTileDrawable.java b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
index 8f47d6321..f5b4c7508 100644
--- a/src/com/android/contacts/lettertiles/LetterTileDrawable.java
+++ b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
@@ -29,7 +29,7 @@ import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 import junit.framework.Assert;
 
diff --git a/src/com/android/contacts/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java
index 1d42968a8..6559489fd 100644
--- a/src/com/android/contacts/list/AccountFilterActivity.java
+++ b/src/com/android/contacts/list/AccountFilterActivity.java
@@ -29,7 +29,7 @@ import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.AccountTypeManager;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/list/ContactEntryListAdapter.java b/src/com/android/contacts/list/ContactEntryListAdapter.java
index 6615d3aed..79d01e023 100644
--- a/src/com/android/contacts/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java
@@ -37,7 +37,7 @@ import android.widget.TextView;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.compat.DirectoryCompat;
 import com.android.contacts.util.SearchUtil;
diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index f6a5c70c8..52b7b4f1c 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -28,7 +28,7 @@ import android.view.ViewGroup;
 import android.widget.ListView;
 
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.ContactsCompat;
 import com.android.contacts.preference.ContactsPreferences;
 
diff --git a/src/com/android/contacts/list/ContactListFilterView.java b/src/com/android/contacts/list/ContactListFilterView.java
index 2378d2f29..4670200bd 100644
--- a/src/com/android/contacts/list/ContactListFilterView.java
+++ b/src/com/android/contacts/list/ContactListFilterView.java
@@ -26,7 +26,7 @@ import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.account.AccountType;
 
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index e2834c2dd..1aaa033bf 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -53,7 +53,7 @@ import android.widget.TextView;
 
 import com.android.contacts.common.ContactPresenceIconUtil;
 import com.android.contacts.common.ContactStatusUtil;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.format.TextHighlighter;
diff --git a/src/com/android/contacts/list/ContactListPinnedHeaderView.java b/src/com/android/contacts/list/ContactListPinnedHeaderView.java
index 25aa1d687..e65dea08f 100644
--- a/src/com/android/contacts/list/ContactListPinnedHeaderView.java
+++ b/src/com/android/contacts/list/ContactListPinnedHeaderView.java
@@ -25,7 +25,7 @@ import android.view.View;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 /**
  * A custom view for the pinned section header shown at the top of the contact list.
diff --git a/src/com/android/contacts/list/ContactTileAdapter.java b/src/com/android/contacts/list/ContactTileAdapter.java
index ebf62d17e..275813a5e 100644
--- a/src/com/android/contacts/list/ContactTileAdapter.java
+++ b/src/com/android/contacts/list/ContactTileAdapter.java
@@ -33,7 +33,7 @@ import com.android.contacts.common.ContactPresenceIconUtil;
 import com.android.contacts.common.ContactStatusUtil;
 import com.android.contacts.common.ContactTileLoaderFactory;
 import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.util.ViewUtil;
 
 import java.util.ArrayList;
diff --git a/src/com/android/contacts/list/ContactTileView.java b/src/com/android/contacts/list/ContactTileView.java
index 770d38ebc..8f6e3d2bf 100644
--- a/src/com/android/contacts/list/ContactTileView.java
+++ b/src/com/android/contacts/list/ContactTileView.java
@@ -30,7 +30,7 @@ import android.widget.TextView;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 /**
  * A ContactTile displays a contact's picture and name
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 67c664d0c..5c03ece12 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -58,7 +58,7 @@ import android.widget.TextView;
 
 import com.android.contacts.model.account.AccountDisplayInfo;
 import com.android.contacts.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.ValuesDelta;
 import com.android.contacts.model.account.AccountType;
diff --git a/src/com/android/contacts/list/DirectoryListLoader.java b/src/com/android/contacts/list/DirectoryListLoader.java
index d8ab256f4..192c744f2 100644
--- a/src/com/android/contacts/list/DirectoryListLoader.java
+++ b/src/com/android/contacts/list/DirectoryListLoader.java
@@ -27,7 +27,7 @@ import android.provider.ContactsContract.Directory;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.DirectoryCompat;
 
 /**
diff --git a/src/com/android/contacts/list/GroupMemberPickerFragment.java b/src/com/android/contacts/list/GroupMemberPickerFragment.java
index 83184ec76..f5d13ab88 100644
--- a/src/com/android/contacts/list/GroupMemberPickerFragment.java
+++ b/src/com/android/contacts/list/GroupMemberPickerFragment.java
@@ -30,7 +30,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.contacts.activities.ContactSelectionActivity;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.list.ContactListAdapter.ContactQuery;
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.group.GroupUtil;
diff --git a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
index 7651f3ad3..2ff79b826 100644
--- a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
@@ -137,6 +137,6 @@ public class MultiSelectEmailAddressesListFragment
 
     @Override
     protected View inflateView(LayoutInflater inflater, ViewGroup container) {
-        return inflater.inflate(com.android.contacts.common.R.layout.contact_list_content, null);
+        return inflater.inflate(com.android.contacts.R.layout.contact_list_content, null);
     }
 }
diff --git a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
index 44843034e..06a478ffd 100644
--- a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
@@ -122,6 +122,6 @@ public class MultiSelectPhoneNumbersListFragment
 
     @Override
     protected View inflateView(LayoutInflater inflater, ViewGroup container) {
-        return inflater.inflate(com.android.contacts.common.R.layout.contact_list_content, null);
+        return inflater.inflate(com.android.contacts.R.layout.contact_list_content, null);
     }
 }
diff --git a/src/com/android/contacts/list/PhoneNumberListAdapter.java b/src/com/android/contacts/list/PhoneNumberListAdapter.java
index 0f46f92bb..b7db1ed89 100644
--- a/src/com/android/contacts/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/list/PhoneNumberListAdapter.java
@@ -37,7 +37,7 @@ import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.CallableCompat;
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.compat.DirectoryCompat;
diff --git a/src/com/android/contacts/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
index e0d9e2216..6a736dba9 100644
--- a/src/com/android/contacts/list/PhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
@@ -27,7 +27,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
 
 /**
diff --git a/src/com/android/contacts/list/ShortcutIntentBuilder.java b/src/com/android/contacts/list/ShortcutIntentBuilder.java
index 57f622804..1f67eb059 100644
--- a/src/com/android/contacts/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/list/ShortcutIntentBuilder.java
@@ -45,7 +45,7 @@ import android.text.TextUtils.TruncateAt;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.util.ImplicitIntentsUtil;
 
 /**
diff --git a/src/com/android/contacts/model/account/AccountType.java b/src/com/android/contacts/model/account/AccountType.java
index d727e0c76..111f4364e 100644
--- a/src/com/android/contacts/model/account/AccountType.java
+++ b/src/com/android/contacts/model/account/AccountType.java
@@ -28,7 +28,7 @@ import android.provider.ContactsContract.RawContacts;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.dataitem.DataKind;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/model/account/BaseAccountType.java b/src/com/android/contacts/model/account/BaseAccountType.java
index 0e7469efd..de07b3109 100644
--- a/src/com/android/contacts/model/account/BaseAccountType.java
+++ b/src/com/android/contacts/model/account/BaseAccountType.java
@@ -39,7 +39,7 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.inputmethod.EditorInfo;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.dataitem.CustomDataItem;
 import com.android.contacts.model.dataitem.DataKind;
 import com.android.contacts.util.CommonDateUtils;
diff --git a/src/com/android/contacts/model/account/ExchangeAccountType.java b/src/com/android/contacts/model/account/ExchangeAccountType.java
index 91a9d7d4f..bd7985276 100644
--- a/src/com/android/contacts/model/account/ExchangeAccountType.java
+++ b/src/com/android/contacts/model/account/ExchangeAccountType.java
@@ -30,7 +30,7 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.provider.ContactsContract.CommonDataKinds.Website;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.dataitem.DataKind;
 import com.android.contacts.util.CommonDateUtils;
 import com.android.contactsbind.FeedbackHelper;
diff --git a/src/com/android/contacts/model/account/ExternalAccountType.java b/src/com/android/contacts/model/account/ExternalAccountType.java
index c385d4482..c914c7494 100644
--- a/src/com/android/contacts/model/account/ExternalAccountType.java
+++ b/src/com/android/contacts/model/account/ExternalAccountType.java
@@ -33,7 +33,7 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.dataitem.DataKind;
 import com.android.contactsbind.FeedbackHelper;
 
diff --git a/src/com/android/contacts/model/account/FallbackAccountType.java b/src/com/android/contacts/model/account/FallbackAccountType.java
index c3f25dead..d104330fe 100644
--- a/src/com/android/contacts/model/account/FallbackAccountType.java
+++ b/src/com/android/contacts/model/account/FallbackAccountType.java
@@ -19,7 +19,7 @@ package com.android.contacts.model.account;
 import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.dataitem.DataKind;
 import com.android.contactsbind.FeedbackHelper;
 
diff --git a/src/com/android/contacts/model/account/GoogleAccountType.java b/src/com/android/contacts/model/account/GoogleAccountType.java
index 2bc02e7c4..c7aac7639 100644
--- a/src/com/android/contacts/model/account/GoogleAccountType.java
+++ b/src/com/android/contacts/model/account/GoogleAccountType.java
@@ -23,7 +23,7 @@ import android.provider.ContactsContract.CommonDataKinds.Event;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.Relation;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.dataitem.DataKind;
 import com.android.contacts.util.CommonDateUtils;
 import com.android.contactsbind.FeedbackHelper;
diff --git a/src/com/android/contacts/model/account/SamsungAccountType.java b/src/com/android/contacts/model/account/SamsungAccountType.java
index c5f9c86e4..c478c67bc 100644
--- a/src/com/android/contacts/model/account/SamsungAccountType.java
+++ b/src/com/android/contacts/model/account/SamsungAccountType.java
@@ -18,7 +18,7 @@ package com.android.contacts.model.account;
 
 import com.google.common.collect.Lists;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.dataitem.DataKind;
 import com.android.contacts.util.CommonDateUtils;
 import com.android.contactsbind.FeedbackHelper;
diff --git a/src/com/android/contacts/model/account/SimAccountType.java b/src/com/android/contacts/model/account/SimAccountType.java
index afcccd594..6e64c6434 100644
--- a/src/com/android/contacts/model/account/SimAccountType.java
+++ b/src/com/android/contacts/model/account/SimAccountType.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.provider.ContactsContract.CommonDataKinds.Nickname;
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.dataitem.DataKind;
 
 import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java
index 9ba026e7f..72e786d4a 100644
--- a/src/com/android/contacts/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -27,7 +27,7 @@ import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.widget.Toast;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.common.activity.LicenseActivity;
 
 /**
diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index 4d412be2b..b617ef013 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -33,7 +33,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.interactions.ImportDialogFragment;
 import com.android.contacts.list.ProviderStatusWatcher;
 import com.android.contacts.model.account.AccountWithDataSet;
diff --git a/src/com/android/contacts/preference/ContactsPreferences.java b/src/com/android/contacts/preference/ContactsPreferences.java
index f18aedf28..584dff6bd 100644
--- a/src/com/android/contacts/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/preference/ContactsPreferences.java
@@ -29,7 +29,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.account.AccountWithDataSet;
 
 import java.util.List;
diff --git a/src/com/android/contacts/preference/DisplayOrderPreference.java b/src/com/android/contacts/preference/DisplayOrderPreference.java
index f8a70ab24..801bb248a 100644
--- a/src/com/android/contacts/preference/DisplayOrderPreference.java
+++ b/src/com/android/contacts/preference/DisplayOrderPreference.java
@@ -21,7 +21,7 @@ import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 /**
  * Custom preference: view-name-as (first name first or last name first).
diff --git a/src/com/android/contacts/preference/SortOrderPreference.java b/src/com/android/contacts/preference/SortOrderPreference.java
index c38eee3d7..387023112 100644
--- a/src/com/android/contacts/preference/SortOrderPreference.java
+++ b/src/com/android/contacts/preference/SortOrderPreference.java
@@ -21,7 +21,7 @@ import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 /**
  * Custom preference: sort-by.
diff --git a/src/com/android/contacts/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java
index 5fefd869a..a29af9ac3 100644
--- a/src/com/android/contacts/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -32,7 +32,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountWithDataSet;
diff --git a/src/com/android/contacts/util/AccountsListAdapter.java b/src/com/android/contacts/util/AccountsListAdapter.java
index cda4d4b09..43f86172f 100644
--- a/src/com/android/contacts/util/AccountsListAdapter.java
+++ b/src/com/android/contacts/util/AccountsListAdapter.java
@@ -26,7 +26,7 @@ import android.widget.TextView;
 
 import com.android.contacts.model.account.AccountDisplayInfo;
 import com.android.contacts.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.account.AccountWithDataSet;
 
diff --git a/src/com/android/contacts/util/ContactDisplayUtils.java b/src/com/android/contacts/util/ContactDisplayUtils.java
index f61a257ed..25cb1eb3d 100644
--- a/src/com/android/contacts/util/ContactDisplayUtils.java
+++ b/src/com/android/contacts/util/ContactDisplayUtils.java
@@ -30,7 +30,7 @@ import android.text.style.TtsSpan;
 import android.util.Log;
 import android.util.Patterns;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.preference.ContactsPreferences;
 
diff --git a/src/com/android/contacts/util/DataStatus.java b/src/com/android/contacts/util/DataStatus.java
index ff3c7d3bf..f26761503 100644
--- a/src/com/android/contacts/util/DataStatus.java
+++ b/src/com/android/contacts/util/DataStatus.java
@@ -24,7 +24,7 @@ import android.provider.ContactsContract.Data;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 /**
  * Storage for a social status update. Holds a single update, but can use
diff --git a/src/com/android/contacts/util/LocalizedNameResolver.java b/src/com/android/contacts/util/LocalizedNameResolver.java
index 73f07adaf..e6acc6450 100644
--- a/src/com/android/contacts/util/LocalizedNameResolver.java
+++ b/src/com/android/contacts/util/LocalizedNameResolver.java
@@ -28,7 +28,7 @@ import android.content.res.XmlResourceParser;
 import android.util.AttributeSet;
 import android.util.Xml;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.account.ExternalAccountType;
 
 import org.xmlpull.v1.XmlPullParser;
diff --git a/src/com/android/contacts/util/MaterialColorMapUtils.java b/src/com/android/contacts/util/MaterialColorMapUtils.java
index f940885da..95b1dba71 100644
--- a/src/com/android/contacts/util/MaterialColorMapUtils.java
+++ b/src/com/android/contacts/util/MaterialColorMapUtils.java
@@ -33,9 +33,9 @@ public class MaterialColorMapUtils {
 
     public MaterialColorMapUtils(Resources resources) {
         sPrimaryColors = resources.obtainTypedArray(
-                com.android.contacts.common.R.array.letter_tile_colors);
+                com.android.contacts.R.array.letter_tile_colors);
         sSecondaryColors = resources.obtainTypedArray(
-                com.android.contacts.common.R.array.letter_tile_colors_dark);
+                com.android.contacts.R.array.letter_tile_colors_dark);
     }
 
     public static class MaterialPalette implements Parcelable {
diff --git a/src/com/android/contacts/util/ViewUtil.java b/src/com/android/contacts/util/ViewUtil.java
index 0ced72741..ccb8a82ec 100644
--- a/src/com/android/contacts/util/ViewUtil.java
+++ b/src/com/android/contacts/util/ViewUtil.java
@@ -23,7 +23,7 @@ import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.widget.ListView;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.CompatUtils;
 
 /**
diff --git a/src/com/android/contacts/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java
index 6354944f7..5787d620a 100644
--- a/src/com/android/contacts/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -28,7 +28,7 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 /**
  * The Activity for canceling vCard import/export.
diff --git a/src/com/android/contacts/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
index 27a7601f7..c1171d81d 100644
--- a/src/com/android/contacts/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -30,7 +30,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contactsbind.FeedbackHelper;
 import com.android.vcard.VCardComposer;
 import com.android.vcard.VCardConfig;
diff --git a/src/com/android/contacts/vcard/ExportVCardActivity.java b/src/com/android/contacts/vcard/ExportVCardActivity.java
index a6c96eab1..4ffbb3734 100644
--- a/src/com/android/contacts/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ExportVCardActivity.java
@@ -34,7 +34,7 @@ import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.util.Log;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.common.activity.RequestImportVCardPermissionsActivity;
 
 import java.util.List;
diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
index e65c3d553..d4a06a822 100644
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -40,7 +40,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.common.activity.RequestImportVCardPermissionsActivity;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.account.AccountWithDataSet;
diff --git a/src/com/android/contacts/vcard/NfcImportVCardActivity.java b/src/com/android/contacts/vcard/NfcImportVCardActivity.java
index bcf375abb..77454a646 100644
--- a/src/com/android/contacts/vcard/NfcImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/NfcImportVCardActivity.java
@@ -35,7 +35,7 @@ import android.provider.ContactsContract.RawContacts;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.account.AccountWithDataSet;
diff --git a/src/com/android/contacts/vcard/NotificationImportExportListener.java b/src/com/android/contacts/vcard/NotificationImportExportListener.java
index 247f399ba..c68bf0f10 100644
--- a/src/com/android/contacts/vcard/NotificationImportExportListener.java
+++ b/src/com/android/contacts/vcard/NotificationImportExportListener.java
@@ -31,7 +31,7 @@ import android.provider.ContactsContract.RawContacts;
 import android.support.v4.app.NotificationCompat;
 import android.widget.Toast;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.vcard.VCardEntry;
 
 import java.text.NumberFormat;
diff --git a/src/com/android/contacts/vcard/SelectAccountActivity.java b/src/com/android/contacts/vcard/SelectAccountActivity.java
index a0583d28d..8809fac89 100644
--- a/src/com/android/contacts/vcard/SelectAccountActivity.java
+++ b/src/com/android/contacts/vcard/SelectAccountActivity.java
@@ -22,7 +22,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.util.AccountSelectionUtil;
diff --git a/src/com/android/contacts/vcard/ShareVCardActivity.java b/src/com/android/contacts/vcard/ShareVCardActivity.java
index ba6ce92e6..787ddc63d 100644
--- a/src/com/android/contacts/vcard/ShareVCardActivity.java
+++ b/src/com/android/contacts/vcard/ShareVCardActivity.java
@@ -21,7 +21,7 @@ import android.os.IBinder;
 import android.support.v4.content.FileProvider;
 import android.util.Log;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contactsbind.FeedbackHelper;
 
 import java.io.File;
diff --git a/src/com/android/contacts/vcard/VCardService.java b/src/com/android/contacts/vcard/VCardService.java
index 721c2e424..459e1d43c 100644
--- a/src/com/android/contacts/vcard/VCardService.java
+++ b/src/com/android/contacts/vcard/VCardService.java
@@ -25,7 +25,7 @@ import android.os.IBinder;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/android/contacts/widget/FloatingActionButtonController.java b/src/com/android/contacts/widget/FloatingActionButtonController.java
index 9f3504937..ab63fee82 100644
--- a/src/com/android/contacts/widget/FloatingActionButtonController.java
+++ b/src/com/android/contacts/widget/FloatingActionButtonController.java
@@ -25,7 +25,7 @@ import android.view.View;
 import android.widget.ImageButton;
 
 import com.android.contacts.util.ViewUtil;
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.phone.common.animation.AnimUtils;
 
 /**
diff --git a/src/com/android/contacts/widget/ProportionalLayout.java b/src/com/android/contacts/widget/ProportionalLayout.java
index b60d2a4f0..79c58eccd 100644
--- a/src/com/android/contacts/widget/ProportionalLayout.java
+++ b/src/com/android/contacts/widget/ProportionalLayout.java
@@ -22,7 +22,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 
 /**
  * Layout that calculates its height based on its width, or vice versa (depending on the set
diff --git a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
index 8b7bb5f1d..da2b468da 100644
--- a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
+++ b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
@@ -39,7 +39,7 @@ import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.compat.PhoneAccountCompat;
 import com.android.contacts.compat.PhoneNumberUtilsCompat;
 
diff --git a/tests/Android.mk b/tests/Android.mk
index 583980a13..09c97cd77 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,7 +7,7 @@ LOCAL_CERTIFICATE := shared
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-res_dirs := res ../res-icons
+res_dirs := res
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
 
 LOCAL_PACKAGE_NAME := ContactsTests
diff --git a/tests/res/mipmap-hdpi/ic_contacts_launcher.png b/tests/res/mipmap-hdpi/ic_contacts_launcher.png
new file mode 100644
index 000000000..0fd1492ba
--- /dev/null
+++ b/tests/res/mipmap-hdpi/ic_contacts_launcher.png
diff --git a/tests/res/mipmap-mdpi/ic_contacts_launcher.png b/tests/res/mipmap-mdpi/ic_contacts_launcher.png
new file mode 100644
index 000000000..e23930b82
--- /dev/null
+++ b/tests/res/mipmap-mdpi/ic_contacts_launcher.png
diff --git a/tests/res/mipmap-xhdpi/ic_contacts_launcher.png b/tests/res/mipmap-xhdpi/ic_contacts_launcher.png
new file mode 100644
index 000000000..aff0f3166
--- /dev/null
+++ b/tests/res/mipmap-xhdpi/ic_contacts_launcher.png
diff --git a/tests/res/mipmap-xxhdpi/ic_contacts_launcher.png b/tests/res/mipmap-xxhdpi/ic_contacts_launcher.png
new file mode 100644
index 000000000..9cd2ebe42
--- /dev/null
+++ b/tests/res/mipmap-xxhdpi/ic_contacts_launcher.png
diff --git a/tests/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/tests/res/mipmap-xxxhdpi/ic_contacts_launcher.png
new file mode 100644
index 000000000..74c41792f
--- /dev/null
+++ b/tests/res/mipmap-xxxhdpi/ic_contacts_launcher.png
diff --git a/tests/src/com/android/contacts/model/account/AccountTypeTest.java b/tests/src/com/android/contacts/model/account/AccountTypeTest.java
index bb88648f2..15aaa18c0 100644
--- a/tests/src/com/android/contacts/model/account/AccountTypeTest.java
+++ b/tests/src/com/android/contacts/model/account/AccountTypeTest.java
@@ -49,7 +49,7 @@ public class AccountTypeTest extends InstrumentationTestCase {
                 AccountType.getResourceText(c, packageName, externalResID, DEFAULT));
 
         // Load from the contacts package itself.
-        final int internalResId = com.android.contacts.common.R.string.contactsList;
+        final int internalResId = com.android.contacts.R.string.contactsList;
         assertEquals(c.getString(internalResId),
                 AccountType.getResourceText(c, null, internalResId, DEFAULT));
     }
diff --git a/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
index 9032a0215..88c9e29a2 100644
--- a/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
+++ b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
@@ -21,7 +21,7 @@ import static android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.android.contacts.common.R;
+import com.android.contacts.R;
 import com.android.contacts.preference.ContactsPreferences;
 
 import org.mockito.Mock;