Consolidate commonbind and contactsbind (1/2)
am: e837ae3e14
Change-Id: I490e18776aca2da0fd61790eeea4e6d0b52db285
diff --git a/proguard.flags b/proguard.flags
index 7b9bc89..18362bc 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -13,7 +13,7 @@
-keep class com.android.contacts.common.** { *;}
# For test:
--keep class com.android.contacts.commonbind.analytics.AnalyticsUtil { *;}
+-keep class com.android.contactsbind.analytics.AnalyticsUtil { *;}
-keep class com.android.contacts.interactions.** { *;}
-keep class com.android.contacts.util.SyncUtil { *;}
-keep class com.google.common.base.Objects { *;}
diff --git a/src-bind/com/android/commonbind/ObjectFactory.java b/src-bind/com/android/contactsbind/ObjectFactory.java
similarity index 95%
rename from src-bind/com/android/commonbind/ObjectFactory.java
rename to src-bind/com/android/contactsbind/ObjectFactory.java
index 3bbd52d..1a5b346 100644
--- a/src-bind/com/android/commonbind/ObjectFactory.java
+++ b/src-bind/com/android/contactsbind/ObjectFactory.java
@@ -11,7 +11,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package com.android.contacts.commonbind;
+package com.android.contactsbind;
import com.android.contacts.common.logging.Logger;
import com.android.contacts.common.preference.PreferenceManager;
diff --git a/src-bind/com/android/commonbind/analytics/AnalyticsUtil.java b/src-bind/com/android/contactsbind/analytics/AnalyticsUtil.java
similarity index 96%
rename from src-bind/com/android/commonbind/analytics/AnalyticsUtil.java
rename to src-bind/com/android/contactsbind/analytics/AnalyticsUtil.java
index 84420b6..e48e8f2 100644
--- a/src-bind/com/android/commonbind/analytics/AnalyticsUtil.java
+++ b/src-bind/com/android/contactsbind/analytics/AnalyticsUtil.java
@@ -12,7 +12,7 @@
* the License.
*/
-package com.android.contacts.commonbind.analytics;
+package com.android.contactsbind.analytics;
import android.app.Activity;
import android.app.Application;
diff --git a/src-bind/com/android/commonbind/experiments/Flags.java b/src-bind/com/android/contactsbind/experiments/Flags.java
similarity index 95%
rename from src-bind/com/android/commonbind/experiments/Flags.java
rename to src-bind/com/android/contactsbind/experiments/Flags.java
index 875712f..5bf47e8 100644
--- a/src-bind/com/android/commonbind/experiments/Flags.java
+++ b/src-bind/com/android/contactsbind/experiments/Flags.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
-package com.android.contacts.commonbind.experiments;
+package com.android.contactsbind.experiments;
import android.content.Context;
diff --git a/src-bind/com/android/commonbind/util/UserAgentGenerator.java b/src-bind/com/android/contactsbind/util/UserAgentGenerator.java
similarity index 95%
rename from src-bind/com/android/commonbind/util/UserAgentGenerator.java
rename to src-bind/com/android/contactsbind/util/UserAgentGenerator.java
index 13bcaca..1cb44b8 100644
--- a/src-bind/com/android/commonbind/util/UserAgentGenerator.java
+++ b/src-bind/com/android/contactsbind/util/UserAgentGenerator.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.commonbind.util;
+package com.android.contactsbind.util;
import android.content.Context;
import android.content.pm.PackageManager;
diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index 0ba1f02..f8a1f20 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -31,7 +31,7 @@
import com.android.contacts.common.testing.InjectedServices;
import com.android.contacts.common.util.Constants;
-import com.android.contacts.commonbind.analytics.AnalyticsUtil;
+import com.android.contactsbind.analytics.AnalyticsUtil;
import com.android.contacts.common.testing.NeededForTesting;
import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/common/ContactPhotoManager.java b/src/com/android/contacts/common/ContactPhotoManager.java
index 81b6b06..623b207 100644
--- a/src/com/android/contacts/common/ContactPhotoManager.java
+++ b/src/com/android/contacts/common/ContactPhotoManager.java
@@ -60,7 +60,7 @@
import com.android.contacts.common.util.PermissionsUtil;
import com.android.contacts.common.util.TrafficStatsTags;
import com.android.contacts.common.util.UriUtils;
-import com.android.contacts.commonbind.util.UserAgentGenerator;
+import com.android.contactsbind.util.UserAgentGenerator;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 60f983d..7e1b487 100644
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -53,7 +53,7 @@
import com.android.contacts.common.vcard.ExportVCardActivity;
import com.android.contacts.common.vcard.VCardCommonArguments;
import com.android.contacts.common.vcard.ShareVCardActivity;
-import com.android.contacts.commonbind.analytics.AnalyticsUtil;
+import com.android.contactsbind.analytics.AnalyticsUtil;
import java.util.List;
diff --git a/src/com/android/contacts/common/list/DefaultContactListAdapter.java b/src/com/android/contacts/common/list/DefaultContactListAdapter.java
index 994fe1a..666de8c 100644
--- a/src/com/android/contacts/common/list/DefaultContactListAdapter.java
+++ b/src/com/android/contacts/common/list/DefaultContactListAdapter.java
@@ -27,16 +27,14 @@
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Directory;
-import android.provider.ContactsContract.RawContacts;
import android.provider.ContactsContract.SearchSnippets;
import android.text.TextUtils;
import android.view.View;
-import com.android.contacts.common.Experiments;
import com.android.contacts.common.compat.ContactsCompat;
import com.android.contacts.common.model.account.AccountWithDataSet;
import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.commonbind.experiments.Flags;
+import com.android.contactsbind.experiments.Flags;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java
index 3d542eb..3b7ed6b 100644
--- a/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java
@@ -29,7 +29,7 @@
import com.android.contacts.common.R;
import com.android.contacts.common.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
-import com.android.contacts.commonbind.analytics.AnalyticsUtil;
+import com.android.contactsbind.analytics.AnalyticsUtil;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/src/com/android/contacts/common/logging/Logger.java b/src/com/android/contacts/common/logging/Logger.java
index 72d1e2a..c0fbd9a 100644
--- a/src/com/android/contacts/common/logging/Logger.java
+++ b/src/com/android/contacts/common/logging/Logger.java
@@ -18,7 +18,7 @@
import android.app.Activity;
import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.commonbind.ObjectFactory;
+import com.android.contactsbind.ObjectFactory;
/**
* Logs analytics events.
diff --git a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
index 57229a4..6afcb13 100644
--- a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
@@ -47,7 +47,7 @@
import com.android.contacts.common.model.account.AccountWithDataSet;
import com.android.contacts.common.util.AccountFilterUtil;
import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.commonbind.ObjectFactory;
+import com.android.contactsbind.ObjectFactory;
import java.util.List;