From 84a6d29f889148c49db278f0682bbdf8d8466b1f Mon Sep 17 00:00:00 2001 From: twyen Date: Mon, 25 Jun 2018 15:25:35 -0700 Subject: Move contacts.commons.R to dialer.contacts.resources This reduces dependency on contacts.common which is full of things that should not be there. Ideally resources inside dialer.contacts.resources should be individually moved to appropriate locations, but the resources are too large to work with. TEST=TAP Test: TAP PiperOrigin-RevId: 202029832 Change-Id: I95bfcb59799b9c3640de03ad0680624fc1b2c3a3 --- .../contacts/common/model/account/AccountType.java | 2 +- .../common/model/account/BaseAccountType.java | 2 +- .../common/model/account/ExchangeAccountType.java | 6 ++--- .../common/model/account/ExternalAccountType.java | 30 ++++++++++------------ .../common/model/account/FallbackAccountType.java | 6 ++--- .../common/model/account/GoogleAccountType.java | 6 ++--- .../common/model/account/SamsungAccountType.java | 6 ++--- 7 files changed, 27 insertions(+), 31 deletions(-) (limited to 'java/com/android/contacts/common/model') diff --git a/java/com/android/contacts/common/model/account/AccountType.java b/java/com/android/contacts/common/model/account/AccountType.java index ed0d421a9..499286a13 100644 --- a/java/com/android/contacts/common/model/account/AccountType.java +++ b/java/com/android/contacts/common/model/account/AccountType.java @@ -29,8 +29,8 @@ import android.support.v4.content.ContextCompat; import android.util.ArrayMap; import android.view.inputmethod.EditorInfo; import android.widget.EditText; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; +import com.android.dialer.contacts.resources.R; import java.text.Collator; import java.util.ArrayList; import java.util.Collections; diff --git a/java/com/android/contacts/common/model/account/BaseAccountType.java b/java/com/android/contacts/common/model/account/BaseAccountType.java index ccdad3641..2911975d5 100644 --- a/java/com/android/contacts/common/model/account/BaseAccountType.java +++ b/java/com/android/contacts/common/model/account/BaseAccountType.java @@ -37,11 +37,11 @@ import android.provider.ContactsContract.CommonDataKinds.Website; import android.util.ArrayMap; import android.util.AttributeSet; import android.view.inputmethod.EditorInfo; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; import com.android.contacts.common.util.CommonDateUtils; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/java/com/android/contacts/common/model/account/ExchangeAccountType.java b/java/com/android/contacts/common/model/account/ExchangeAccountType.java index a27028e80..0a95e7ecb 100644 --- a/java/com/android/contacts/common/model/account/ExchangeAccountType.java +++ b/java/com/android/contacts/common/model/account/ExchangeAccountType.java @@ -29,10 +29,10 @@ import android.provider.ContactsContract.CommonDataKinds.Photo; import android.provider.ContactsContract.CommonDataKinds.StructuredName; import android.provider.ContactsContract.CommonDataKinds.StructuredPostal; import android.provider.ContactsContract.CommonDataKinds.Website; -import android.util.Log; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; import com.android.contacts.common.util.CommonDateUtils; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.util.ArrayList; import java.util.Locale; @@ -67,7 +67,7 @@ public class ExchangeAccountType extends BaseAccountType { mIsInitialized = true; } catch (DefinitionException e) { - Log.e(TAG, "Problem building account type", e); + LogUtil.e(TAG, "Problem building account type", e); } } diff --git a/java/com/android/contacts/common/model/account/ExternalAccountType.java b/java/com/android/contacts/common/model/account/ExternalAccountType.java index aca1f70d2..618def78a 100644 --- a/java/com/android/contacts/common/model/account/ExternalAccountType.java +++ b/java/com/android/contacts/common/model/account/ExternalAccountType.java @@ -30,10 +30,10 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredName; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.util.Xml; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -152,7 +152,7 @@ public class ExternalAccountType extends BaseAccountType { error.append(" for external package "); error.append(packageName); - Log.e(TAG, error.toString(), e); + LogUtil.e(TAG, error.toString(), e); return; } finally { if (parser != null) { @@ -210,13 +210,11 @@ public class ExternalAccountType extends BaseAccountType { for (String metadataName : METADATA_CONTACTS_NAMES) { final XmlResourceParser parser = serviceInfo.loadXmlMetaData(pm, metadataName); if (parser != null) { - if (Log.isLoggable(TAG, Log.DEBUG)) { - Log.d( - TAG, - String.format( - "Metadata loaded from: %s, %s, %s", - serviceInfo.packageName, serviceInfo.name, metadataName)); - } + LogUtil.d( + TAG, + String.format( + "Metadata loaded from: %s, %s, %s", + serviceInfo.packageName, serviceInfo.name, metadataName)); return parser; } } @@ -250,7 +248,7 @@ public class ExternalAccountType extends BaseAccountType { return -1; // Empty text is okay. } if (resourceName.charAt(0) != '@') { - Log.e(TAG, xmlAttributeName + " must be a resource name beginnig with '@'"); + LogUtil.e(TAG, xmlAttributeName + " must be a resource name beginnig with '@'"); return -1; } final String name = resourceName.substring(1); @@ -258,12 +256,12 @@ public class ExternalAccountType extends BaseAccountType { try { res = context.getPackageManager().getResourcesForApplication(packageName); } catch (NameNotFoundException e) { - Log.e(TAG, "Unable to load package " + packageName); + LogUtil.e(TAG, "Unable to load package " + packageName); return -1; } final int resId = res.getIdentifier(name, null, packageName); if (resId == 0) { - Log.e(TAG, "Unable to load " + resourceName + " from package " + packageName); + LogUtil.e(TAG, "Unable to load " + resourceName + " from package " + packageName); return -1; } return resId; @@ -366,9 +364,7 @@ public class ExternalAccountType extends BaseAccountType { for (int i = 0; i < attributeCount; i++) { String attr = parser.getAttributeName(i); String value = parser.getAttributeValue(i); - if (Log.isLoggable(TAG, Log.DEBUG)) { - Log.d(TAG, attr + "=" + value); - } + LogUtil.d(TAG, attr + "=" + value); if (ATTR_EDIT_CONTACT_ACTIVITY.equals(attr)) { mEditContactActivityClassName = value; } else if (ATTR_CREATE_CONTACT_ACTIVITY.equals(attr)) { @@ -394,7 +390,7 @@ public class ExternalAccountType extends BaseAccountType { } else if (ATTR_ACCOUNT_ICON.equals(attr)) { mAccountTypeIconAttribute = value; } else { - Log.e(TAG, "Unsupported attribute " + attr); + LogUtil.e(TAG, "Unsupported attribute " + attr); } } diff --git a/java/com/android/contacts/common/model/account/FallbackAccountType.java b/java/com/android/contacts/common/model/account/FallbackAccountType.java index 976a7b892..ee3a7578d 100644 --- a/java/com/android/contacts/common/model/account/FallbackAccountType.java +++ b/java/com/android/contacts/common/model/account/FallbackAccountType.java @@ -17,9 +17,9 @@ package com.android.contacts.common.model.account; import android.content.Context; -import android.util.Log; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; public class FallbackAccountType extends BaseAccountType { @@ -53,7 +53,7 @@ public class FallbackAccountType extends BaseAccountType { mIsInitialized = true; } catch (DefinitionException e) { - Log.e(TAG, "Problem building account type", e); + LogUtil.e(TAG, "Problem building account type", e); } } diff --git a/java/com/android/contacts/common/model/account/GoogleAccountType.java b/java/com/android/contacts/common/model/account/GoogleAccountType.java index 2f1fe0ed6..a25544bb9 100644 --- a/java/com/android/contacts/common/model/account/GoogleAccountType.java +++ b/java/com/android/contacts/common/model/account/GoogleAccountType.java @@ -22,10 +22,10 @@ import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Event; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.Relation; -import android.util.Log; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; import com.android.contacts.common.util.CommonDateUtils; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -69,7 +69,7 @@ public class GoogleAccountType extends BaseAccountType { mIsInitialized = true; } catch (DefinitionException e) { - Log.e(TAG, "Problem building account type", e); + LogUtil.e(TAG, "Problem building account type", e); } } diff --git a/java/com/android/contacts/common/model/account/SamsungAccountType.java b/java/com/android/contacts/common/model/account/SamsungAccountType.java index 45406bc2b..77c0575ea 100644 --- a/java/com/android/contacts/common/model/account/SamsungAccountType.java +++ b/java/com/android/contacts/common/model/account/SamsungAccountType.java @@ -23,10 +23,10 @@ import android.provider.ContactsContract.CommonDataKinds.Event; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.Relation; import android.provider.ContactsContract.CommonDataKinds.StructuredPostal; -import android.util.Log; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; import com.android.contacts.common.util.CommonDateUtils; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.util.ArrayList; import java.util.Locale; @@ -69,7 +69,7 @@ public class SamsungAccountType extends BaseAccountType { mIsInitialized = true; } catch (DefinitionException e) { - Log.e(TAG, "Problem building account type", e); + LogUtil.e(TAG, "Problem building account type", e); } } -- cgit v1.2.3