commit 0a49afa2ad697307cc04ef4cb86570574fa720f2
author Gary Mai <garymai@google.com> Mon Dec 05 15:53:58 2016 -0800
committer Gary Mai <garymai@google.com> Tue Dec 06 14:15:52 2016 -0800
tree b2c533b8a6c7f7d115e5912a729f1b3aaef5eaab
parent 3f6a2444e0134b7380cdb2e13abf4bf1163336d0

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

AndroidManifest_common.xml

diff --git a/AndroidManifest_common.xml b/AndroidManifest_common.xml
index 06c9352..ac5e50d 100644
--- a/AndroidManifest_common.xml
+++ b/AndroidManifest_common.xml
@@ -219,7 +219,7 @@
             android:launchMode="singleTop"
             android:exported="false"/>
 
-        <activity android:name=".common.activity.LicenseActivity"
+        <activity android:name=".activities.LicenseActivity"
             android:label="@string/activity_title_licenses"
             android:theme="@style/ContactsPreferencesTheme"
             android:exported="true" />
@@ -237,17 +237,17 @@
             android:theme="@style/ContactListFilterTheme" />
 
         <activity
-            android:name=".common.activity.RequestPermissionsActivity"
+            android:name=".activities.RequestPermissionsActivity"
             android:theme="@style/PeopleTheme"
             android:exported="false"/>
 
         <activity
-            android:name=".common.activity.RequestDesiredPermissionsActivity"
+            android:name=".activities.RequestDesiredPermissionsActivity"
             android:theme="@style/PeopleTheme"
             android:exported="false"/>
 
         <activity
-            android:name=".common.activity.RequestImportVCardPermissionsActivity"
+            android:name=".activities.RequestImportVCardPermissionsActivity"
             android:theme="@style/PeopleTheme"
             android:exported="false"/>
 
@@ -377,7 +377,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".common.test.FragmentTestActivity">
+        <activity android:name=".test.FragmentTestActivity">
             <intent-filter>
                 <category android:name="android.intent.category.TEST" />
             </intent-filter>