Collapse res-aosp and res-icons into res folder for AOSP Contacts (1/2)
bug:31022536
Change-Id: I0434710d92027e59ccd97e27ebd09f1668346684
diff --git a/Android.mk b/Android.mk
index a03d671..47653cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@
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
similarity index 100%
rename from res-icons/mipmap-hdpi/ic_contacts_launcher.png
rename to res/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-mdpi/ic_contacts_launcher.png b/res/mipmap-mdpi/ic_contacts_launcher.png
similarity index 100%
rename from res-icons/mipmap-mdpi/ic_contacts_launcher.png
rename to res/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-xhdpi/ic_contacts_launcher.png b/res/mipmap-xhdpi/ic_contacts_launcher.png
similarity index 100%
rename from res-icons/mipmap-xhdpi/ic_contacts_launcher.png
rename to res/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png b/res/mipmap-xxhdpi/ic_contacts_launcher.png
similarity index 100%
rename from res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
rename to res/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png b/res/mipmap-xxxhdpi/ic_contacts_launcher.png
similarity index 100%
rename from res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
rename to res/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 8dd1ba9..aa53a8a 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
similarity index 100%
rename from res-aosp/xml/shortcuts.xml
rename to 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 9e86ee8..7cd761f 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 7e75223..45a941e 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 b1a77de..413765d 100644
--- a/src/com/android/contacts/dialog/CallSubjectDialog.java
+++ b/src/com/android/contacts/dialog/CallSubjectDialog.java
@@ -46,7 +46,7 @@
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 70d766a..7591de3 100644
--- a/src/com/android/contacts/dialog/ClearFrequentsDialog.java
+++ b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
@@ -28,7 +28,7 @@
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 2067f9f..fe3d9d6 100644
--- a/src/com/android/contacts/editor/SelectAccountDialogFragment.java
+++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
@@ -26,7 +26,7 @@
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 bd50842..78dae65 100644
--- a/src/com/android/contacts/group/GroupMembersAdapter.java
+++ b/src/com/android/contacts/group/GroupMembersAdapter.java
@@ -27,7 +27,7 @@
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 772bc21..c7ce072 100644
--- a/src/com/android/contacts/interactions/ExportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ExportDialogFragment.java
@@ -38,7 +38,7 @@
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 ff9300a..6bbd72e 100644
--- a/src/com/android/contacts/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -35,7 +35,7 @@
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 8f47d63..f5b4c75 100644
--- a/src/com/android/contacts/lettertiles/LetterTileDrawable.java
+++ b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
@@ -29,7 +29,7 @@
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 1d42968..6559489 100644
--- a/src/com/android/contacts/list/AccountFilterActivity.java
+++ b/src/com/android/contacts/list/AccountFilterActivity.java
@@ -29,7 +29,7 @@
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 6615d3a..79d01e0 100644
--- a/src/com/android/contacts/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java
@@ -37,7 +37,7 @@
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 f6a5c70..52b7b4f 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -28,7 +28,7 @@
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 2378d2f..4670200 100644
--- a/src/com/android/contacts/list/ContactListFilterView.java
+++ b/src/com/android/contacts/list/ContactListFilterView.java
@@ -26,7 +26,7 @@
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 e2834c2..1aaa033 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -53,7 +53,7 @@
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 25aa1d6..e65dea0 100644
--- a/src/com/android/contacts/list/ContactListPinnedHeaderView.java
+++ b/src/com/android/contacts/list/ContactListPinnedHeaderView.java
@@ -25,7 +25,7 @@
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 ebf62d1..275813a 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.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 770d38e..8f6e3d2 100644
--- a/src/com/android/contacts/list/ContactTileView.java
+++ b/src/com/android/contacts/list/ContactTileView.java
@@ -30,7 +30,7 @@
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 67c664d..5c03ece 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -58,7 +58,7 @@
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 d8ab256..192c744 100644
--- a/src/com/android/contacts/list/DirectoryListLoader.java
+++ b/src/com/android/contacts/list/DirectoryListLoader.java
@@ -27,7 +27,7 @@
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 83184ec..f5d13ab 100644
--- a/src/com/android/contacts/list/GroupMemberPickerFragment.java
+++ b/src/com/android/contacts/list/GroupMemberPickerFragment.java
@@ -30,7 +30,7 @@
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 7651f3a..2ff79b8 100644
--- a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
@@ -137,6 +137,6 @@
@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 4484303..06a478f 100644
--- a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
@@ -122,6 +122,6 @@
@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 0f46f92..b7db1ed 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.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 e0d9e22..6a736db 100644
--- a/src/com/android/contacts/list/PhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
@@ -27,7 +27,7 @@
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 57f6228..1f67eb0 100644
--- a/src/com/android/contacts/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/list/ShortcutIntentBuilder.java
@@ -45,7 +45,7 @@
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 d727e0c..111f436 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.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 0e7469e..de07b31 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.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 91a9d7d..bd79852 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.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 c385d44..c914c74 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.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 c3f25de..d104330 100644
--- a/src/com/android/contacts/model/account/FallbackAccountType.java
+++ b/src/com/android/contacts/model/account/FallbackAccountType.java
@@ -19,7 +19,7 @@
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 2bc02e7..c7aac76 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.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 c5f9c86..c478c67 100644
--- a/src/com/android/contacts/model/account/SamsungAccountType.java
+++ b/src/com/android/contacts/model/account/SamsungAccountType.java
@@ -18,7 +18,7 @@
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 afcccd5..6e64c64 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.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 9ba026e..72e786d 100644
--- a/src/com/android/contacts/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -27,7 +27,7 @@
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 4d412be..b617ef0 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -33,7 +33,7 @@
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 f18aedf..584dff6 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.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 f8a70ab..801bb24 100644
--- a/src/com/android/contacts/preference/DisplayOrderPreference.java
+++ b/src/com/android/contacts/preference/DisplayOrderPreference.java
@@ -21,7 +21,7 @@
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 c38eee3..3870231 100644
--- a/src/com/android/contacts/preference/SortOrderPreference.java
+++ b/src/com/android/contacts/preference/SortOrderPreference.java
@@ -21,7 +21,7 @@
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 5fefd86..a29af9a 100644
--- a/src/com/android/contacts/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -32,7 +32,7 @@
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 cda4d4b..43f8617 100644
--- a/src/com/android/contacts/util/AccountsListAdapter.java
+++ b/src/com/android/contacts/util/AccountsListAdapter.java
@@ -26,7 +26,7 @@
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 f61a257..25cb1eb 100644
--- a/src/com/android/contacts/util/ContactDisplayUtils.java
+++ b/src/com/android/contacts/util/ContactDisplayUtils.java
@@ -30,7 +30,7 @@
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 ff3c7d3..f267615 100644
--- a/src/com/android/contacts/util/DataStatus.java
+++ b/src/com/android/contacts/util/DataStatus.java
@@ -24,7 +24,7 @@
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 73f07ad..e6acc64 100644
--- a/src/com/android/contacts/util/LocalizedNameResolver.java
+++ b/src/com/android/contacts/util/LocalizedNameResolver.java
@@ -28,7 +28,7 @@
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 f940885..95b1dba 100644
--- a/src/com/android/contacts/util/MaterialColorMapUtils.java
+++ b/src/com/android/contacts/util/MaterialColorMapUtils.java
@@ -33,9 +33,9 @@
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 0ced727..ccb8a82 100644
--- a/src/com/android/contacts/util/ViewUtil.java
+++ b/src/com/android/contacts/util/ViewUtil.java
@@ -23,7 +23,7 @@
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 6354944..5787d62 100644
--- a/src/com/android/contacts/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -28,7 +28,7 @@
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 27a7601..c1171d8 100644
--- a/src/com/android/contacts/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -30,7 +30,7 @@
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 a6c96ea..4ffbb37 100644
--- a/src/com/android/contacts/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ExportVCardActivity.java
@@ -34,7 +34,7 @@
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 e65c3d5..d4a06a8 100644
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -40,7 +40,7 @@
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 bcf375a..77454a6 100644
--- a/src/com/android/contacts/vcard/NfcImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/NfcImportVCardActivity.java
@@ -35,7 +35,7 @@
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 247f399..c68bf0f 100644
--- a/src/com/android/contacts/vcard/NotificationImportExportListener.java
+++ b/src/com/android/contacts/vcard/NotificationImportExportListener.java
@@ -31,7 +31,7 @@
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 a0583d2..8809fac 100644
--- a/src/com/android/contacts/vcard/SelectAccountActivity.java
+++ b/src/com/android/contacts/vcard/SelectAccountActivity.java
@@ -22,7 +22,7 @@
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 ba6ce92..787ddc6 100644
--- a/src/com/android/contacts/vcard/ShareVCardActivity.java
+++ b/src/com/android/contacts/vcard/ShareVCardActivity.java
@@ -21,7 +21,7 @@
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 721c2e4..459e1d4 100644
--- a/src/com/android/contacts/vcard/VCardService.java
+++ b/src/com/android/contacts/vcard/VCardService.java
@@ -25,7 +25,7 @@
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 9f35049..ab63fee 100644
--- a/src/com/android/contacts/widget/FloatingActionButtonController.java
+++ b/src/com/android/contacts/widget/FloatingActionButtonController.java
@@ -25,7 +25,7 @@
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 b60d2a4..79c58ec 100644
--- a/src/com/android/contacts/widget/ProportionalLayout.java
+++ b/src/com/android/contacts/widget/ProportionalLayout.java
@@ -22,7 +22,7 @@
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 8b7bb5f..da2b468 100644
--- a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
+++ b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
@@ -39,7 +39,7 @@
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 583980a..09c97cd 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,7 +7,7 @@
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/res-icons/mipmap-hdpi/ic_contacts_launcher.png b/tests/res/mipmap-hdpi/ic_contacts_launcher.png
similarity index 100%
copy from res-icons/mipmap-hdpi/ic_contacts_launcher.png
copy to tests/res/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-mdpi/ic_contacts_launcher.png b/tests/res/mipmap-mdpi/ic_contacts_launcher.png
similarity index 100%
copy from res-icons/mipmap-mdpi/ic_contacts_launcher.png
copy to tests/res/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-xhdpi/ic_contacts_launcher.png b/tests/res/mipmap-xhdpi/ic_contacts_launcher.png
similarity index 100%
copy from res-icons/mipmap-xhdpi/ic_contacts_launcher.png
copy to tests/res/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png b/tests/res/mipmap-xxhdpi/ic_contacts_launcher.png
similarity index 100%
copy from res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
copy to tests/res/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png b/tests/res/mipmap-xxxhdpi/ic_contacts_launcher.png
similarity index 100%
copy from res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
copy to tests/res/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/tests/src/com/android/contacts/model/account/AccountTypeTest.java b/tests/src/com/android/contacts/model/account/AccountTypeTest.java
index bb88648..15aaa18 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 @@
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 9032a02..88c9e29 100644
--- a/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
+++ b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
@@ -21,7 +21,7 @@
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;
