Collapse common package (2/2)

Ran optimize imports on the project as well to re-order everything
which would have changed because of removing common.

Test: Built GoogleContacts, GoogleContactsTests, Contacts,
ContactsTests and ran unit tests.

Bug: 33252370
Change-Id: I881f0ba8b8fef002b6eeefa9a16b34f15b2fd2a9

38 files changed, 111 insertions, 132 deletions

diff --git a/tests/src/com/android/contacts/ContactsLaunchPerformance.java b/tests/src/com/android/contacts/ContactsLaunchPerformance.java
index 894ae2cfc..3aaf483a2 100644
--- a/tests/src/com/android/contacts/ContactsLaunchPerformance.java
+++ b/tests/src/com/android/contacts/ContactsLaunchPerformance.java
@@ -21,7 +21,7 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.android.contacts.common.test.LaunchPerformanceBase;
+import com.android.contacts.test.LaunchPerformanceBase;
 
 /**
  * Instrumentation class for Address Book launch performance testing.
diff --git a/tests/src/com/android/contacts/common/ContactsUtilsTests.java b/tests/src/com/android/contacts/ContactsUtilsTests.java
index 1c72f02ec..114ce67dc 100644
--- a/tests/src/com/android/contacts/common/ContactsUtilsTests.java
+++ b/tests/src/com/android/contacts/ContactsUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common;
+package com.android.contacts;
 
 import android.content.ContentValues;
 import android.content.Intent;
diff --git a/tests/src/com/android/contacts/DynamicShortcutsTests.java b/tests/src/com/android/contacts/DynamicShortcutsTests.java
index 34cd8c41d..1f6441760 100644
--- a/tests/src/com/android/contacts/DynamicShortcutsTests.java
+++ b/tests/src/com/android/contacts/DynamicShortcutsTests.java
@@ -15,6 +15,14 @@
  */
 package com.android.contacts;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.annotation.TargetApi;
 import android.app.job.JobScheduler;
 import android.content.ContentProvider;
@@ -32,9 +40,8 @@ import android.support.test.filters.SdkSuppress;
 import android.test.AndroidTestCase;
 import android.test.mock.MockContentResolver;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
 
-import com.android.contacts.common.test.mocks.MockContentProvider;
+import com.android.contacts.test.mocks.MockContentProvider;
 
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
@@ -46,15 +53,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
 @TargetApi(Build.VERSION_CODES.N_MR1)
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N_MR1)
 @SmallTest
diff --git a/tests/src/com/android/contacts/common/MoreContactUtilsTest.java b/tests/src/com/android/contacts/MoreContactUtilsTest.java
index 8d74455d6..6c9d54132 100644
--- a/tests/src/com/android/contacts/common/MoreContactUtilsTest.java
+++ b/tests/src/com/android/contacts/MoreContactUtilsTest.java
@@ -1,4 +1,4 @@
-package com.android.contacts.common;
+package com.android.contacts;
 
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.test.suitebuilder.annotation.SmallTest;
diff --git a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
index 3231ff960..be545a906 100644
--- a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
+++ b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
@@ -1,5 +1,9 @@
 package com.android.contacts;
 
+import static com.android.contacts.util.PermissionsUtil.hasPermission;
+
+import static org.junit.Assume.assumeTrue;
+
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
@@ -17,9 +21,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static com.android.contacts.util.PermissionsUtil.hasPermission;
-import static org.junit.Assume.assumeTrue;
-
 /**
  * Make sure the app doesn't crash when it is started without permissions. Note: this won't
  * run in most environments because permissions will already have been granted.
diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
index 9ff3f9540..4e5796993 100644
--- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java
+++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
@@ -27,20 +27,19 @@ import android.provider.ContactsContract.ProviderStatus;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.android.contacts.ContactPhotoManager;
 import com.android.contacts.ContactsApplication;
-import com.android.contacts.R;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.testing.InjectedServices;
-import com.android.contacts.common.test.mocks.ContactsMockContext;
-import com.android.contacts.common.test.mocks.MockContentProvider;
-import com.android.contacts.common.test.mocks.MockContentProvider.Query;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.model.account.BaseAccountType;
-import com.android.contacts.common.test.mocks.MockAccountTypeManager;
-import com.android.contacts.common.test.mocks.MockContactPhotoManager;
-import com.android.contacts.common.test.mocks.MockSharedPreferences;
+import com.android.contacts.test.mocks.ContactsMockContext;
+import com.android.contacts.test.mocks.MockAccountTypeManager;
+import com.android.contacts.test.mocks.MockContactPhotoManager;
+import com.android.contacts.test.mocks.MockContentProvider;
+import com.android.contacts.test.mocks.MockContentProvider.Query;
+import com.android.contacts.test.mocks.MockSharedPreferences;
+import com.android.contacts.testing.InjectedServices;
 
 /**
  * This test is so outdated that it's disabled temporarily.  TODO Update the test and re-enable it.
diff --git a/tests/src/com/android/contacts/activities/SimImportActivityTest.java b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
index 98e61f6da..8ebe69bdb 100644
--- a/tests/src/com/android/contacts/activities/SimImportActivityTest.java
+++ b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
@@ -1,5 +1,13 @@
 package com.android.contacts.activities;
 
+import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasMimeType;
+import static com.android.contacts.tests.ContactsMatchers.hasRowMatching;
+import static com.android.contacts.tests.ContactsMatchers.hasValueForColumn;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.junit.Assert.assertTrue;
+
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Instrumentation;
@@ -29,6 +37,7 @@ import com.android.contacts.tests.AccountsTestHelper;
 import com.android.contacts.tests.ContactsMatchers;
 import com.android.contacts.tests.FakeSimContactDao;
 import com.android.contacts.tests.StringableCursor;
+
 import com.google.common.base.Functions;
 
 import org.hamcrest.BaseMatcher;
@@ -39,13 +48,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasMimeType;
-import static com.android.contacts.tests.ContactsMatchers.hasRowMatching;
-import static com.android.contacts.tests.ContactsMatchers.hasValueForColumn;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.allOf;
-import static org.junit.Assert.assertTrue;
-
 /**
  * UI Tests for {@link SimImportActivity}
  *
diff --git a/tests/src/com/android/contacts/database/SimContactDaoTests.java b/tests/src/com/android/contacts/database/SimContactDaoTests.java
index 69a7e1f70..8e6edef29 100644
--- a/tests/src/com/android/contacts/database/SimContactDaoTests.java
+++ b/tests/src/com/android/contacts/database/SimContactDaoTests.java
@@ -15,6 +15,20 @@
  */
 package com.android.contacts.database;
 
+import static android.os.Build.VERSION_CODES;
+
+import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasEmail;
+import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasName;
+import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasPhone;
+import static com.android.contacts.tests.ContactsMatchers.isSimContactWithNameAndPhone;
+
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -39,11 +53,12 @@ import android.test.mock.MockContext;
 import com.android.contacts.model.SimCard;
 import com.android.contacts.model.SimContact;
 import com.android.contacts.model.account.AccountWithDataSet;
-import com.android.contacts.common.test.mocks.MockContentProvider;
+import com.android.contacts.test.mocks.MockContentProvider;
 import com.android.contacts.tests.AccountsTestHelper;
 import com.android.contacts.tests.ContactsMatchers;
 import com.android.contacts.tests.SimContactsTestHelper;
 import com.android.contacts.tests.StringableCursor;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
@@ -64,18 +79,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
-import static android.os.Build.VERSION_CODES;
-import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasEmail;
-import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasName;
-import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasPhone;
-import static com.android.contacts.tests.ContactsMatchers.isSimContactWithNameAndPhone;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @RunWith(Enclosed.class)
 public class SimContactDaoTests {
 
diff --git a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
index 952e3a0ef..f6c2d1b1c 100644
--- a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
@@ -22,7 +22,8 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountWithDataSet;
-import com.android.contacts.common.test.mocks.MockAccountTypeManager;
+import com.android.contacts.test.mocks.MockAccountTypeManager;
+
 import com.google.common.collect.Sets;
 
 import java.util.Collection;
diff --git a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
index 559d27249..b42308d17 100644
--- a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
@@ -24,8 +24,8 @@ import android.provider.Settings;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.android.contacts.model.account.AccountDisplayInfo;
 import com.android.contacts.R;
+import com.android.contacts.model.account.AccountDisplayInfo;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountWithDataSet;
 
diff --git a/tests/src/com/android/contacts/group/GroupUtilTest.java b/tests/src/com/android/contacts/group/GroupUtilTest.java
index cf1176207..5f72e9d14 100644
--- a/tests/src/com/android/contacts/group/GroupUtilTest.java
+++ b/tests/src/com/android/contacts/group/GroupUtilTest.java
@@ -16,14 +16,14 @@
 
 package com.android.contacts.group;
 
-import com.android.contacts.list.ContactsSectionIndexer;
-
 import android.os.Bundle;
 import android.provider.ContactsContract.Contacts;
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.android.contacts.list.ContactsSectionIndexer;
+
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
index dfae98c54..258b81895 100644
--- a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
+++ b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
@@ -28,12 +28,12 @@ import com.android.contacts.R;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.BaseAccountType;
-import com.android.contacts.common.test.FragmentTestActivity;
-import com.android.contacts.common.test.IntegrationTestUtils;
-import com.android.contacts.common.test.mocks.ContactsMockContext;
-import com.android.contacts.common.test.mocks.MockAccountTypeManager;
-import com.android.contacts.common.test.mocks.MockContentProvider;
-import com.android.contacts.common.test.mocks.MockContentProvider.Query;
+import com.android.contacts.test.FragmentTestActivity;
+import com.android.contacts.test.IntegrationTestUtils;
+import com.android.contacts.test.mocks.ContactsMockContext;
+import com.android.contacts.test.mocks.MockAccountTypeManager;
+import com.android.contacts.test.mocks.MockContentProvider;
+import com.android.contacts.test.mocks.MockContentProvider.Query;
 import com.android.contacts.testing.InjectedServices;
 
 /**
diff --git a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
index 4ef102c20..da2e6c3bd 100644
--- a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
+++ b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.contacts.model;
 
+import static org.mockito.Mockito.when;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
@@ -27,6 +29,7 @@ import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountTypeWithDataSet;
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.model.account.GoogleAccountType;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
@@ -34,8 +37,6 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
-import static org.mockito.Mockito.when;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
diff --git a/tests/src/com/android/contacts/model/AccountWithDataSetTest.java b/tests/src/com/android/contacts/model/AccountWithDataSetTest.java
index 4e543b919..7d6dfa397 100644
--- a/tests/src/com/android/contacts/model/AccountWithDataSetTest.java
+++ b/tests/src/com/android/contacts/model/AccountWithDataSetTest.java
@@ -22,6 +22,7 @@ import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.contacts.model.account.AccountWithDataSet;
+
 import com.google.common.collect.Lists;
 
 import java.util.List;
diff --git a/tests/src/com/android/contacts/model/ContactLoaderTest.java b/tests/src/com/android/contacts/model/ContactLoaderTest.java
index b54280865..91873e9df 100644
--- a/tests/src/com/android/contacts/model/ContactLoaderTest.java
+++ b/tests/src/com/android/contacts/model/ContactLoaderTest.java
@@ -33,19 +33,19 @@ import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.model.account.BaseAccountType;
+import com.android.contacts.test.mocks.ContactsMockContext;
+import com.android.contacts.test.mocks.MockAccountTypeManager;
+import com.android.contacts.test.mocks.MockContentProvider;
 import com.android.contacts.testing.InjectedServices;
-import com.android.contacts.common.test.mocks.ContactsMockContext;
-import com.android.contacts.common.test.mocks.MockContentProvider;
-import com.android.contacts.common.test.mocks.MockAccountTypeManager;
 import com.android.contacts.util.Constants;
 
 import com.google.common.collect.Lists;
 
-import java.util.List;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 /**
  * Runs ContactLoader tests for the the contact-detail and editor view.
  */
diff --git a/tests/src/com/android/contacts/model/Cp2DeviceLocalAccountLocatorTests.java b/tests/src/com/android/contacts/model/Cp2DeviceLocalAccountLocatorTests.java
index 70460b4be..e6e67bfd8 100644
--- a/tests/src/com/android/contacts/model/Cp2DeviceLocalAccountLocatorTests.java
+++ b/tests/src/com/android/contacts/model/Cp2DeviceLocalAccountLocatorTests.java
@@ -29,9 +29,9 @@ import android.test.mock.MockContentResolver;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.contacts.model.account.AccountWithDataSet;
-import com.android.contacts.common.test.mocks.MockContentProvider;
-import com.android.contacts.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.test.mocks.MockContentProvider;
 import com.android.contacts.tests.FakeDeviceAccountTypeFactory;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/tests/src/com/android/contacts/common/RawContactDeltaListTests.java b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
index 16bb5a1d0..45654958f 100644
--- a/tests/src/com/android/contacts/common/RawContactDeltaListTests.java
+++ b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common;
+package com.android.contacts.model;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentValues;
@@ -29,17 +29,10 @@ import android.provider.ContactsContract.RawContacts;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 
-import com.android.contacts.common.RawContactModifierTests.MockContactsSource;
 import com.android.contacts.compat.CompatUtils;
-import com.android.contacts.model.CPOWrapper;
-import com.android.contacts.model.RawContact;
-import com.android.contacts.model.RawContactDelta;
-import com.android.contacts.model.ValuesDelta;
-import com.android.contacts.model.RawContactDeltaList;
-import com.android.contacts.model.RawContactModifier;
 import com.android.contacts.model.account.AccountType;
-import com.google.common.collect.Lists;
 
+import com.google.common.collect.Lists;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -91,7 +84,7 @@ public class RawContactDeltaListTests extends AndroidTestCase {
      * testing purposes.
      */
     protected AccountType getAccountType() {
-        return new MockContactsSource();
+        return new RawContactModifierTests.MockContactsSource();
     }
 
     static ContentValues getValues(ContentProviderOperation operation)
diff --git a/tests/src/com/android/contacts/common/RawContactDeltaTests.java b/tests/src/com/android/contacts/model/RawContactDeltaTests.java
index e261e555d..f5d4181d6 100644
--- a/tests/src/com/android/contacts/common/RawContactDeltaTests.java
+++ b/tests/src/com/android/contacts/model/RawContactDeltaTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common;
+package com.android.contacts.model;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentValues;
@@ -28,11 +28,7 @@ import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import com.android.contacts.compat.CompatUtils;
-import com.android.contacts.model.BuilderWrapper;
-import com.android.contacts.model.CPOWrapper;
-import com.android.contacts.model.RawContact;
-import com.android.contacts.model.RawContactDelta;
-import com.android.contacts.model.ValuesDelta;
+
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
diff --git a/tests/src/com/android/contacts/common/RawContactModifierTests.java b/tests/src/com/android/contacts/model/RawContactModifierTests.java
index dccfb8275..594bb443f 100644
--- a/tests/src/com/android/contacts/common/RawContactModifierTests.java
+++ b/tests/src/com/android/contacts/model/RawContactModifierTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common;
+package com.android.contacts.model;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentValues;
@@ -32,21 +32,15 @@ import android.provider.ContactsContract.RawContacts;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 
+import com.android.contacts.R;
 import com.android.contacts.compat.CompatUtils;
-import com.android.contacts.model.AccountTypeManager;
-import com.android.contacts.model.CPOWrapper;
-import com.android.contacts.model.RawContact;
-import com.android.contacts.model.RawContactDelta;
-import com.android.contacts.model.ValuesDelta;
-import com.android.contacts.model.RawContactDeltaList;
-import com.android.contacts.model.RawContactModifier;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountType.EditType;
 import com.android.contacts.model.account.ExchangeAccountType;
 import com.android.contacts.model.account.GoogleAccountType;
 import com.android.contacts.model.dataitem.DataKind;
-import com.android.contacts.common.test.mocks.ContactsMockContext;
-import com.android.contacts.common.test.mocks.MockAccountTypeManager;
+import com.android.contacts.test.mocks.ContactsMockContext;
+import com.android.contacts.test.mocks.MockAccountTypeManager;
 
 import com.google.common.collect.Lists;
 
diff --git a/tests/src/com/android/contacts/model/SimContactTests.java b/tests/src/com/android/contacts/model/SimContactTests.java
index eeac68ddb..d234e42d7 100644
--- a/tests/src/com/android/contacts/model/SimContactTests.java
+++ b/tests/src/com/android/contacts/model/SimContactTests.java
@@ -15,6 +15,9 @@
  */
 package com.android.contacts.model;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
 import android.os.Parcel;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
@@ -22,9 +25,6 @@ import android.support.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class SimContactTests {
diff --git a/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
index 8a8d25c60..24b01d5e0 100644
--- a/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
+++ b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
@@ -32,8 +32,8 @@ import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.Suppress;
 
-import com.android.contacts.model.dataitem.DataKind;
 import com.android.contacts.common.tests.R;
+import com.android.contacts.model.dataitem.DataKind;
 
 import com.google.common.base.Objects;
 
diff --git a/tests/src/com/android/contacts/model/dataitem/DataItemTests.java b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
index d6a213fa7..7b60bebca 100644
--- a/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
+++ b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
@@ -33,12 +33,11 @@ import android.provider.ContactsContract.Contacts.Entity;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.android.contacts.common.Collapser;
+import com.android.contacts.Collapser;
 import com.android.contacts.model.account.AccountType.EditType;
 import com.android.contacts.model.account.BaseAccountType;
 import com.android.contacts.model.account.GoogleAccountType;
 
-import java.lang.Math;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/tests/src/com/android/contacts/common/test/FragmentTestActivity.java b/tests/src/com/android/contacts/test/FragmentTestActivity.java
index 5ae2d956d..d58dc8ff2 100644
--- a/tests/src/com/android/contacts/common/test/FragmentTestActivity.java
+++ b/tests/src/com/android/contacts/test/FragmentTestActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.test;
+package com.android.contacts.test;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/tests/src/com/android/contacts/common/test/IntegrationTestUtils.java b/tests/src/com/android/contacts/test/IntegrationTestUtils.java
index 5457128d3..60bb65b5e 100644
--- a/tests/src/com/android/contacts/common/test/IntegrationTestUtils.java
+++ b/tests/src/com/android/contacts/test/IntegrationTestUtils.java
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.test;
-
-import static android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP;
-import static android.os.PowerManager.FULL_WAKE_LOCK;
-import static android.os.PowerManager.ON_AFTER_RELEASE;
+package com.android.contacts.test;
 
 import android.app.Activity;
 import android.app.Instrumentation;
diff --git a/tests/src/com/android/contacts/common/test/LaunchPerformanceBase.java b/tests/src/com/android/contacts/test/LaunchPerformanceBase.java
index a2ebde3dc..8feb604f6 100644
--- a/tests/src/com/android/contacts/common/test/LaunchPerformanceBase.java
+++ b/tests/src/com/android/contacts/test/LaunchPerformanceBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.test;
+package com.android.contacts.test;
 
 import android.app.Instrumentation;
 import android.content.Intent;
diff --git a/tests/src/com/android/contacts/common/test/mocks/ContactsMockContext.java b/tests/src/com/android/contacts/test/mocks/ContactsMockContext.java
index c72fe3d85..293f8e779 100644
--- a/tests/src/com/android/contacts/common/test/mocks/ContactsMockContext.java
+++ b/tests/src/com/android/contacts/test/mocks/ContactsMockContext.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.test.mocks;
+package com.android.contacts.test.mocks;
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.ProviderInfo;
 import android.provider.ContactsContract;
 import android.provider.Settings;
 import android.test.mock.MockContentResolver;
diff --git a/tests/src/com/android/contacts/common/test/mocks/ContactsMockPackageManager.java b/tests/src/com/android/contacts/test/mocks/ContactsMockPackageManager.java
index a1557ffd2..275b8b78d 100644
--- a/tests/src/com/android/contacts/common/test/mocks/ContactsMockPackageManager.java
+++ b/tests/src/com/android/contacts/test/mocks/ContactsMockPackageManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.test.mocks;
+package com.android.contacts.test.mocks;
 
 import android.content.ComponentName;
 import android.content.pm.ApplicationInfo;
diff --git a/tests/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java b/tests/src/com/android/contacts/test/mocks/MockAccountTypeManager.java
index 532b0d83f..00686aa15 100644
--- a/tests/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java
+++ b/tests/src/com/android/contacts/test/mocks/MockAccountTypeManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.contacts.common.test.mocks;
+package com.android.contacts.test.mocks;
 
 import android.accounts.Account;
 
@@ -22,6 +22,7 @@ import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountTypeWithDataSet;
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.model.account.BaseAccountType;
+
 import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
diff --git a/tests/src/com/android/contacts/common/test/mocks/MockContactPhotoManager.java b/tests/src/com/android/contacts/test/mocks/MockContactPhotoManager.java
index db8f06f25..e0bd42585 100644
--- a/tests/src/com/android/contacts/common/test/mocks/MockContactPhotoManager.java
+++ b/tests/src/com/android/contacts/test/mocks/MockContactPhotoManager.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.test.mocks;
+package com.android.contacts.test.mocks;
 
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.android.contacts.common.ContactPhotoManager;
+import com.android.contacts.ContactPhotoManager;
 
 /**
  * A photo preloader that always uses the "no contact" picture and never executes any real
diff --git a/tests/src/com/android/contacts/common/test/mocks/MockContentProvider.java b/tests/src/com/android/contacts/test/mocks/MockContentProvider.java
index d3950fc36..77eb1c910 100644
--- a/tests/src/com/android/contacts/common/test/mocks/MockContentProvider.java
+++ b/tests/src/com/android/contacts/test/mocks/MockContentProvider.java
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.test.mocks;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Maps;
+package com.android.contacts.test.mocks;
 
 import android.content.ContentValues;
 import android.content.UriMatcher;
@@ -26,6 +23,9 @@ import android.database.MatrixCursor;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
+
 import junit.framework.Assert;
 
 import java.util.ArrayList;
diff --git a/tests/src/com/android/contacts/common/test/mocks/MockSharedPreferences.java b/tests/src/com/android/contacts/test/mocks/MockSharedPreferences.java
index 13d035ef9..787b9052c 100644
--- a/tests/src/com/android/contacts/common/test/mocks/MockSharedPreferences.java
+++ b/tests/src/com/android/contacts/test/mocks/MockSharedPreferences.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.contacts.common.test.mocks;
+package com.android.contacts.test.mocks;
 
 import android.content.SharedPreferences;
 
diff --git a/tests/src/com/android/contacts/tests/AccountsTestHelper.java b/tests/src/com/android/contacts/tests/AccountsTestHelper.java
index 454602600..be0a9856e 100644
--- a/tests/src/com/android/contacts/tests/AccountsTestHelper.java
+++ b/tests/src/com/android/contacts/tests/AccountsTestHelper.java
@@ -15,11 +15,13 @@
  */
 package com.android.contacts.tests;
 
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.os.Binder;
 import android.os.Build;
 import android.provider.ContactsContract.RawContacts;
 import android.support.annotation.NonNull;
@@ -32,9 +34,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-
 @SuppressWarnings("MissingPermission")
 public class AccountsTestHelper {
     private static final String TAG = "AccountsTestHelper";
diff --git a/tests/src/com/android/contacts/tests/ContactsMatchers.java b/tests/src/com/android/contacts/tests/ContactsMatchers.java
index a3a08dea7..77aed117f 100644
--- a/tests/src/com/android/contacts/tests/ContactsMatchers.java
+++ b/tests/src/com/android/contacts/tests/ContactsMatchers.java
@@ -15,6 +15,8 @@
  */
 package com.android.contacts.tests;
 
+import static org.hamcrest.Matchers.allOf;
+
 import android.database.Cursor;
 import android.provider.ContactsContract;
 
@@ -24,8 +26,6 @@ import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 
-import static org.hamcrest.Matchers.allOf;
-
 
 /**
  * Has useful {@link org.hamcrest.Matchers}s for the Contacts app
diff --git a/tests/src/com/android/contacts/tests/PhoneNumberTestService.java b/tests/src/com/android/contacts/tests/PhoneNumberTestService.java
index d5fee9242..d8ba9b2ec 100644
--- a/tests/src/com/android/contacts/tests/PhoneNumberTestService.java
+++ b/tests/src/com/android/contacts/tests/PhoneNumberTestService.java
@@ -17,12 +17,12 @@
 package com.android.contacts.tests;
 
 import android.app.IntentService;
-import android.content.Context;
 import android.content.Intent;
 import android.telephony.PhoneNumberUtils;
 import android.util.Log;
 
-import com.android.contacts.common.GeoUtil;
+import com.android.contacts.GeoUtil;
+
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
diff --git a/tests/src/com/android/contacts/tests/SimContactsTestHelper.java b/tests/src/com/android/contacts/tests/SimContactsTestHelper.java
index ffecd74ea..ab10ed550 100644
--- a/tests/src/com/android/contacts/tests/SimContactsTestHelper.java
+++ b/tests/src/com/android/contacts/tests/SimContactsTestHelper.java
@@ -15,6 +15,10 @@
  */
 package com.android.contacts.tests;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
+
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
 import android.content.ContentResolver;
@@ -36,10 +40,6 @@ import com.android.contacts.model.SimContact;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assume.assumeThat;
-import static org.junit.Assume.assumeTrue;
-
 public class SimContactsTestHelper {
 
     private final Context mContext;
diff --git a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
index 32930f957..ba18d6f7a 100644
--- a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
+++ b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
@@ -44,7 +44,6 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.android.contacts.GroupListLoader;
 import com.android.contacts.group.GroupUtil;
 import com.android.contacts.list.UiIntentActions;
 import com.android.contacts.tests.R;
diff --git a/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java b/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java
index 1fce724e5..ca6d16538 100644
--- a/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java
+++ b/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java
@@ -27,7 +27,7 @@ import com.android.contacts.model.account.AccountDisplayInfo;
 import com.android.contacts.model.account.AccountDisplayInfoFactory;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountWithDataSet;
-import com.android.contacts.common.test.mocks.MockAccountTypeManager;
+import com.android.contacts.test.mocks.MockAccountTypeManager;
 import com.android.contacts.tests.FakeAccountType;
 import com.android.contacts.tests.FakeDeviceAccountTypeFactory;
 
diff --git a/tests/src/com/android/contacts/util/SyncUtilTests.java b/tests/src/com/android/contacts/util/SyncUtilTests.java
index 372a652d1..508ff04a0 100644
--- a/tests/src/com/android/contacts/util/SyncUtilTests.java
+++ b/tests/src/com/android/contacts/util/SyncUtilTests.java
@@ -19,9 +19,6 @@ import android.accounts.Account;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Tests for SyncUtil.
  */