diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2009-09-27 17:32:35 -0700 |
|---|---|---|
| committer | Dmitri Plotnikov <dplotnikov@google.com> | 2009-09-27 19:46:39 -0700 |
| commit | 0f30a3a8e8cd6bfba414390e91177b5df2154daf (patch) | |
| tree | 90346849f2b25a71255bdfb11f04f53e34e25fdc | |
| parent | 2a5232ddf4c073b8cdaac7884624d0f6f207ef9e (diff) | |
| download | Calendar-0f30a3a8e8cd6bfba414390e91177b5df2154daf.tar.gz | |
Renaming Presence and Presence-related columns.
Change-Id: I6740a0ff129648f6dabc52dae55c05c434673ac2
| -rw-r--r-- | src/com/android/calendar/EventInfoActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java index f61f91ee..0619c0aa 100644 --- a/src/com/android/calendar/EventInfoActivity.java +++ b/src/com/android/calendar/EventInfoActivity.java @@ -49,6 +49,7 @@ import android.provider.Calendar.Events; import android.provider.Calendar.Reminders; import android.provider.ContactsContract.CommonDataKinds; import android.provider.ContactsContract.Contacts; +import android.provider.ContactsContract.Data; import android.provider.ContactsContract.FastTrack; import android.provider.ContactsContract.Intents; import android.provider.ContactsContract.Presence; @@ -240,8 +241,7 @@ public class EventInfoActivity extends Activity implements View.OnClickListener, private HashMap<String, ViewHolder> mViewHolders = new HashMap<String, ViewHolder>(); private PresenceQueryHandler mPresenceQueryHandler; - private static final Uri CONTACT_DATA_WITH_PRESENCE_URI = - Uri.withAppendedPath(ContactsContract.AUTHORITY_URI, "data_with_presence"); + private static final Uri CONTACT_DATA_WITH_PRESENCE_URI = Data.CONTENT_URI; int PRESENCE_PROJECTION_CONTACT_ID_INDEX = 0; int PRESENCE_PROJECTION_PRESENCE_INDEX = 1; @@ -249,10 +249,10 @@ public class EventInfoActivity extends Activity implements View.OnClickListener, int PRESENCE_PROJECTION_PHOTO_ID_INDEX = 3; private static final String[] PRESENCE_PROJECTION = new String[] { - Email.CONTACT_ID, // 0 - Email.PRESENCE_STATUS, // 1 - Email.DATA, // 2 - Email.PHOTO_ID, // 3 + Email.CONTACT_ID, // 0 + Email.CONTACT_PRESENCE, // 1 + Email.DATA, // 2 + Email.PHOTO_ID, // 3 }; ArrayList<Attendee> mAcceptedAttendees = new ArrayList<Attendee>(); |