diff options
Diffstat (limited to 'src/com/android/contacts/common/ContactTileLoaderFactory.java')
| -rw-r--r-- | src/com/android/contacts/common/ContactTileLoaderFactory.java | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/src/com/android/contacts/common/ContactTileLoaderFactory.java b/src/com/android/contacts/common/ContactTileLoaderFactory.java index 4377d057..33d4ea68 100644 --- a/src/com/android/contacts/common/ContactTileLoaderFactory.java +++ b/src/com/android/contacts/common/ContactTileLoaderFactory.java @@ -37,19 +37,22 @@ public final class ContactTileLoaderFactory { public final static int STARRED = 2; public final static int PHOTO_URI = 3; public final static int LOOKUP_KEY = 4; - public final static int CONTACT_PRESENCE = 5; - public final static int CONTACT_STATUS = 6; + public final static int ACCOUNT_TYPE = 5; + public final static int ACCOUNT_NAME = 6; + + public final static int CONTACT_PRESENCE = 7; + public final static int CONTACT_STATUS = 8; // Only used for StrequentPhoneOnlyLoader - public final static int PHONE_NUMBER = 5; - public final static int PHONE_NUMBER_TYPE = 6; - public final static int PHONE_NUMBER_LABEL = 7; - public final static int IS_DEFAULT_NUMBER = 8; - public final static int PINNED = 9; + public final static int PHONE_NUMBER = 7; + public final static int PHONE_NUMBER_TYPE = 8; + public final static int PHONE_NUMBER_LABEL = 9; + public final static int IS_DEFAULT_NUMBER = 10; + public final static int PINNED = 11; // The _ID field returned for strequent items actually contains data._id instead of // contacts._id because the query is performed on the data table. In order to obtain the // contact id for strequent items, we thus have to use Phone.contact_id instead. - public final static int CONTACT_ID_FOR_DATA = 10; + public final static int CONTACT_ID_FOR_DATA = 12; private static final String[] COLUMNS = new String[] { Contacts._ID, // ..........................................0 @@ -57,8 +60,10 @@ public final class ContactTileLoaderFactory { Contacts.STARRED, // ......................................2 Contacts.PHOTO_URI, // ....................................3 Contacts.LOOKUP_KEY, // ...................................4 - Contacts.CONTACT_PRESENCE, // .............................5 - Contacts.CONTACT_STATUS, // ...............................6 + RawContacts.ACCOUNT_TYPE, // 5 + RawContacts.ACCOUNT_NAME, // 6 + Contacts.CONTACT_PRESENCE, // .............................7 + Contacts.CONTACT_STATUS, // ...............................8 }; /** @@ -74,12 +79,14 @@ public final class ContactTileLoaderFactory { Contacts.STARRED, // ......................................2 Contacts.PHOTO_URI, // ....................................3 Contacts.LOOKUP_KEY, // ...................................4 - Phone.NUMBER, // ..........................................5 - Phone.TYPE, // ............................................6 - Phone.LABEL, // ...........................................7 - Phone.IS_SUPER_PRIMARY, //.................................8 - Contacts.PINNED, // .......................................9 - Phone.CONTACT_ID //........................................10 + RawContacts.ACCOUNT_TYPE, // 5 + RawContacts.ACCOUNT_NAME, // 6 + Phone.NUMBER, // ..........................................7 + Phone.TYPE, // ............................................8 + Phone.LABEL, // ............................................9 + Phone.IS_SUPER_PRIMARY, //.................................10 + Contacts.PINNED, // .......................................11 + Phone.CONTACT_ID //........................................12 }; private static final String STARRED_ORDER = Contacts.DISPLAY_NAME+" COLLATE NOCASE ASC"; |