commit 56045d4a248f82ab0ca3ba2d9df2d3c2aeb4b075
author Dmitri Plotnikov <dplotnikov@google.com> Sun Sep 27 17:36:11 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Sun Sep 27 19:46:50 2009 -0700
tree 054295255d39795f256d729ad3bb1464779002c8
parent 6bfd18de4c928f929bbe02c4af8447108660dcdf

Renaming Presence and Presence-related columns.

Change-Id: If5bfe3d88203cc1dabd81a65ca96e81be193ce71

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index cddcffe..072725a 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -234,7 +234,7 @@
         Contacts.DISPLAY_NAME, // 1
         Contacts.STARRED, //2
         Contacts.TIMES_CONTACTED, //3
-        Presence.PRESENCE_STATUS, //4
+        Contacts.CONTACT_PRESENCE, //4
         Contacts.PHOTO_ID, //5
         Contacts.HAS_PHONE_NUMBER, //6
         Contacts.LOOKUP_KEY, //7

src/com/android/contacts/ui/FastTrackWindow.java

diff --git a/src/com/android/contacts/ui/FastTrackWindow.java b/src/com/android/contacts/ui/FastTrackWindow.java
index 769b957..25a0167 100644
--- a/src/com/android/contacts/ui/FastTrackWindow.java
+++ b/src/com/android/contacts/ui/FastTrackWindow.java
@@ -495,7 +495,7 @@
         // TODO: switch to provider-specific presence dots instead of using
         // overall summary dot.
         final String name = cursor.getString(SummaryQuery.DISPLAY_NAME);
-        final int status = cursor.getInt(SummaryQuery.PRESENCE_STATUS);
+        final int status = cursor.getInt(SummaryQuery.CONTACT_PRESENCE);
         final Drawable statusIcon = getPresenceIcon(status);
 
         setHeaderText(R.id.name, name);
@@ -1268,14 +1268,14 @@
         final String[] PROJECTION = new String[] {
                 Contacts.DISPLAY_NAME,
                 Contacts.PHOTO_ID,
-                Contacts.PRESENCE_STATUS,
-                Contacts.PRESENCE_CUSTOM_STATUS,
+                Contacts.CONTACT_PRESENCE,
+                Contacts.CONTACT_STATUS,
         };
 
         final int DISPLAY_NAME = 0;
         final int PHOTO_ID = 1;
-        final int PRESENCE_STATUS = 2;
-        final int PRESENCE_CUSTOM_STATUS = 3;
+        final int CONTACT_PRESENCE = 2;
+        final int CONTACT_STATUS = 3;
     }
 
     private interface SocialQuery {