Merge "GoogleAccountType extension schema from gmscore"
diff --git a/src/com/android/contacts/common/ContactTileLoaderFactory.java b/src/com/android/contacts/common/ContactTileLoaderFactory.java
index 2a44c09..f8b0c35 100644
--- a/src/com/android/contacts/common/ContactTileLoaderFactory.java
+++ b/src/com/android/contacts/common/ContactTileLoaderFactory.java
@@ -15,6 +15,8 @@
*/
package com.android.contacts.common;
+import com.google.common.annotations.VisibleForTesting;
+
import android.content.Context;
import android.content.CursorLoader;
import android.net.Uri;
@@ -63,7 +65,8 @@
* is set to true. The main difference is the lack of presence
* and status data and the addition of phone number and label.
*/
- private static final String[] COLUMNS_PHONE_ONLY = new String[] {
+ @VisibleForTesting
+ public static final String[] COLUMNS_PHONE_ONLY = new String[] {
Contacts._ID, // ..........................................0
Contacts.DISPLAY_NAME, // .................................1
Contacts.STARRED, // ......................................2
diff --git a/src/com/android/contacts/common/model/account/AccountType.java b/src/com/android/contacts/common/model/account/AccountType.java
index cfafa79..53ab47d 100644
--- a/src/com/android/contacts/common/model/account/AccountType.java
+++ b/src/com/android/contacts/common/model/account/AccountType.java
@@ -197,16 +197,6 @@
return null;
}
- /** Returns an optional Activity string that can be used to view the stream item. */
- public String getViewStreamItemActivity() {
- return null;
- }
-
- /** Returns an optional Activity string that can be used to view the stream item photo. */
- public String getViewStreamItemPhotoActivity() {
- return null;
- }
-
public CharSequence getDisplayLabel(Context context) {
// Note this resource is defined in the sync adapter package, not resourcePackageName.
return getResourceText(context, syncAdapterPackageName, titleRes, accountType);
diff --git a/src/com/android/contacts/common/model/account/ExternalAccountType.java b/src/com/android/contacts/common/model/account/ExternalAccountType.java
index ae6dda1..0097592 100644
--- a/src/com/android/contacts/common/model/account/ExternalAccountType.java
+++ b/src/com/android/contacts/common/model/account/ExternalAccountType.java
@@ -62,9 +62,6 @@
private static final String ATTR_VIEW_CONTACT_NOTIFY_SERVICE = "viewContactNotifyService";
private static final String ATTR_VIEW_GROUP_ACTIVITY = "viewGroupActivity";
private static final String ATTR_VIEW_GROUP_ACTION_LABEL = "viewGroupActionLabel";
- private static final String ATTR_VIEW_STREAM_ITEM_ACTIVITY = "viewStreamItemActivity";
- private static final String ATTR_VIEW_STREAM_ITEM_PHOTO_ACTIVITY =
- "viewStreamItemPhotoActivity";
private static final String ATTR_DATA_SET = "dataSet";
private static final String ATTR_EXTENSION_PACKAGE_NAMES = "extensionPackageNames";
@@ -85,8 +82,6 @@
private String mViewGroupActivity;
private String mViewGroupLabelAttribute;
private int mViewGroupLabelResId;
- private String mViewStreamItemActivity;
- private String mViewStreamItemPhotoActivity;
private List<String> mExtensionPackageNames;
private String mAccountTypeLabelAttribute;
private String mAccountTypeIconAttribute;
@@ -266,16 +261,6 @@
}
@Override
- public String getViewStreamItemActivity() {
- return mViewStreamItemActivity;
- }
-
- @Override
- public String getViewStreamItemPhotoActivity() {
- return mViewStreamItemPhotoActivity;
- }
-
- @Override
public List<String> getExtensionPackageNames() {
return mExtensionPackageNames;
}
@@ -328,10 +313,6 @@
mViewGroupActivity = value;
} else if (ATTR_VIEW_GROUP_ACTION_LABEL.equals(attr)) {
mViewGroupLabelAttribute = value;
- } else if (ATTR_VIEW_STREAM_ITEM_ACTIVITY.equals(attr)) {
- mViewStreamItemActivity = value;
- } else if (ATTR_VIEW_STREAM_ITEM_PHOTO_ACTIVITY.equals(attr)) {
- mViewStreamItemPhotoActivity = value;
} else if (ATTR_DATA_SET.equals(attr)) {
dataSet = value;
} else if (ATTR_EXTENSION_PACKAGE_NAMES.equals(attr)) {