diff options
| author | Yorke Lee <yorkelee@google.com> | 2012-12-06 13:23:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-06 13:23:32 -0800 |
| commit | 32c087b2561131381cbac1511ed896a462dc62e1 (patch) | |
| tree | 809434924f6fbf56adea1e04ca8e74caf236c497 | |
| parent | 36f0a0382f1cfeb2ab22678d326a923e8b283a6d (diff) | |
| parent | a167ed2b5228f0d02165173de47f87416e655c55 (diff) | |
| download | android_packages_apps_ContactsCommon-32c087b2561131381cbac1511ed896a462dc62e1.tar.gz android_packages_apps_ContactsCommon-32c087b2561131381cbac1511ed896a462dc62e1.tar.bz2 android_packages_apps_ContactsCommon-32c087b2561131381cbac1511ed896a462dc62e1.zip | |
Merge "Remove dead code"
3 files changed, 0 insertions, 14 deletions
diff --git a/src/com/android/contacts/common/model/account/ExternalAccountType.java b/src/com/android/contacts/common/model/account/ExternalAccountType.java index 3bc5b3a5..5697efe3 100644 --- a/src/com/android/contacts/common/model/account/ExternalAccountType.java +++ b/src/com/android/contacts/common/model/account/ExternalAccountType.java @@ -377,14 +377,6 @@ public class ExternalAccountType extends BaseAccountType { final String detailColumn = a.getString( com.android.internal.R.styleable.ContactsDataKind_detailColumn); - final boolean detailSocialSummary = a.getBoolean( - com.android.internal.R.styleable.ContactsDataKind_detailSocialSummary, - false); - - if (detailSocialSummary) { - // Inflate social summary when requested - kind.actionBodySocial = true; - } if (detailColumn != null) { // Inflate specific column as summary diff --git a/src/com/android/contacts/common/model/dataitem/DataKind.java b/src/com/android/contacts/common/model/dataitem/DataKind.java index 58a8e7ba..3905d563 100644 --- a/src/com/android/contacts/common/model/dataitem/DataKind.java +++ b/src/com/android/contacts/common/model/dataitem/DataKind.java @@ -53,8 +53,6 @@ public final class DataKind { public StringInflater actionAltHeader; public StringInflater actionBody; - public boolean actionBodySocial = false; - public String typeColumn; /** @@ -124,7 +122,6 @@ public final class DataKind { sb.append(" actionHeader=").append(actionHeader); sb.append(" actionAltHeader=").append(actionAltHeader); sb.append(" actionBody=").append(actionBody); - sb.append(" actionBodySocial=").append(actionBodySocial); sb.append(" typeColumn=").append(typeColumn); sb.append(" typeOverallMax=").append(typeOverallMax); sb.append(" typeList=").append(toString(typeList)); diff --git a/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java b/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java index 56ee8321..7e799f2f 100644 --- a/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java +++ b/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java @@ -188,7 +188,6 @@ public class ExternalAccountTypeTest extends AndroidTestCase { .getColumnNameForTest()); assertEquals("data2", ((BaseAccountType.SimpleInflater) kind.actionBody) .getColumnNameForTest()); - assertEquals(true, kind.actionBodySocial); kind = type.getKindForMimetype("vnd.android.cursor.item/d.e.f"); assertNotNull(kind); @@ -196,7 +195,6 @@ public class ExternalAccountTypeTest extends AndroidTestCase { .getColumnNameForTest()); assertEquals("data4", ((BaseAccountType.SimpleInflater) kind.actionBody) .getColumnNameForTest()); - assertEquals(false, kind.actionBodySocial); kind = type.getKindForMimetype("vnd.android.cursor.item/xyz"); assertNotNull(kind); @@ -204,7 +202,6 @@ public class ExternalAccountTypeTest extends AndroidTestCase { .getColumnNameForTest()); assertEquals("data6", ((BaseAccountType.SimpleInflater) kind.actionBody) .getColumnNameForTest()); - assertEquals(true, kind.actionBodySocial); } private static void assertsDataKindEquals(List<DataKind> expectedKinds, |