commit 3f6a2444e0134b7380cdb2e13abf4bf1163336d0
author Arthur Wang <wuwang@google.com> Mon Dec 05 14:51:59 2016 -0800
committer Arthur Wang <wuwang@google.com> Tue Dec 06 10:40:21 2016 -0800
tree bcb073bdce7dd3a96f88803deea6cc42d04bf222
parent bc775eee757c00907f5ba278724e00a9aa73cdb7

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

bug:31022536
Change-Id: I0434710d92027e59ccd97e27ebd09f1668346684

tests/Android.mk

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

tests/res/mipmap-hdpi/ic_contacts_launcher.png

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 0000000..0fd1492
--- /dev/null
+++ b/tests/res/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ

tests/res/mipmap-mdpi/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 0000000..e23930b
--- /dev/null
+++ b/tests/res/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ

tests/res/mipmap-xhdpi/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 0000000..aff0f31
--- /dev/null
+++ b/tests/res/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ

tests/res/mipmap-xxhdpi/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 0000000..9cd2ebe
--- /dev/null
+++ b/tests/res/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ

tests/res/mipmap-xxxhdpi/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 0000000..74c4179
--- /dev/null
+++ b/tests/res/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ

tests/src/com/android/contacts/model/account/AccountTypeTest.java

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));
     }

tests/src/com/android/contacts/util/ContactDisplayUtilTests.java

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;