summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/GroupMetaDataLoader.java
diff options
context:
space:
mode:
authorDave Santoro <dsantoro@google.com>2011-07-26 17:35:42 -0700
committerDave Santoro <dsantoro@google.com>2011-07-27 17:14:46 -0700
commit2b3f3c54d3beb017b2f59f19e9ce0ecc3e039dbc (patch)
tree5b23df614224d3933b53828896910e4006993186 /src/com/android/contacts/GroupMetaDataLoader.java
parent20aa41d2c414d88ed8434433b1d5061c53bd1bc1 (diff)
downloadpackages_apps_Contacts-2b3f3c54d3beb017b2f59f19e9ce0ecc3e039dbc.tar.gz
packages_apps_Contacts-2b3f3c54d3beb017b2f59f19e9ce0ecc3e039dbc.tar.bz2
packages_apps_Contacts-2b3f3c54d3beb017b2f59f19e9ce0ecc3e039dbc.zip
App changes for account types with data sets.
This is primarily a replacement of the Android Account object in most parts of the app with a new AccountWithDataSet object that extends Account (by adding an additional attribute, the data set). This also includes a major refactoring of the AccountTypeManager, both to allow it to handle data sets and to allow for non-sync-adapter packages to be referenced by the sync adapters for an account and registered as sources of contact data. Attributes of the sync adapter that would typically come from the authenticator can be parsed out of the Contacts XML for these packages. Bug 5077096 Change-Id: I88f311c64eae78c88e9999bff6f7de8538e62157
Diffstat (limited to 'src/com/android/contacts/GroupMetaDataLoader.java')
-rw-r--r--src/com/android/contacts/GroupMetaDataLoader.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/com/android/contacts/GroupMetaDataLoader.java b/src/com/android/contacts/GroupMetaDataLoader.java
index f11217cc5..2f3468b41 100644
--- a/src/com/android/contacts/GroupMetaDataLoader.java
+++ b/src/com/android/contacts/GroupMetaDataLoader.java
@@ -29,6 +29,7 @@ public final class GroupMetaDataLoader extends CursorLoader {
private final static String[] COLUMNS = new String[] {
Groups.ACCOUNT_NAME,
Groups.ACCOUNT_TYPE,
+ Groups.DATA_SET,
Groups._ID,
Groups.TITLE,
Groups.AUTO_ADD,
@@ -41,14 +42,15 @@ public final class GroupMetaDataLoader extends CursorLoader {
public final static int ACCOUNT_NAME = 0;
public final static int ACCOUNT_TYPE = 1;
- public final static int GROUP_ID = 2;
- public final static int TITLE = 3;
- public final static int AUTO_ADD = 4;
- public final static int FAVORITES = 5;
- public final static int IS_READ_ONLY = 6;
- public final static int DELETED = 7;
- public final static int ACTION = 8;
- public final static int ACTION_URI = 9;
+ public final static int DATA_SET = 2;
+ public final static int GROUP_ID = 3;
+ public final static int TITLE = 4;
+ public final static int AUTO_ADD = 5;
+ public final static int FAVORITES = 6;
+ public final static int IS_READ_ONLY = 7;
+ public final static int DELETED = 8;
+ public final static int ACTION = 9;
+ public final static int ACTION_URI = 10;
public GroupMetaDataLoader(Context context, Uri groupUri) {
super(context, ensureIsGroupUri(groupUri), COLUMNS, Groups.ACCOUNT_TYPE + " NOT NULL AND "