Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f22fc124: Adding timestamp and account to contact-level presence columns.

Browse Source 
Merge commit 'f22fc124ff7974d0b6380199f7d53e66bb7feb29' into eclair-plus-aosp

* commit 'f22fc124ff7974d0b6380199f7d53e66bb7feb29':
  Adding timestamp and account to contact-level presence columns.
This commit is contained in:
Dmitri Plotnikov
2009-09-24 13:32:18 -07:00
committed by Android Git Automerger
parent cc2465bbd5 f22fc124ff
commit 2841a1c18a
1 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/java/android/provider/ContactsContract.java
View File

@@ -26,7 +26,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.database.Cursor;
import android.graphics.BitmapFactory;
import android.graphics.Rect;
import android.net.Uri;
import android.os.RemoteException;
@@ -240,6 +239,31 @@ public final class ContactsContract {
*/
public static final String PRESENCE_CUSTOM_STATUS = Presence.PRESENCE_CUSTOM_STATUS;
/**
* The time when the latest presence custom status was inserted/updated.
* This column is only returned if explicitly requested in the query
* projection.
* <p>Type: TEXT</p>
*/
public static final String PRESENCE_CUSTOM_STATUS_TIMESTAMP =
Presence.PRESENCE_CUSTOM_STATUS_TIMESTAMP;
/**
* Protocol that supplied the latest status update (see {@link CommonDataKinds.Im#PROTOCOL}.
* This column is only returned if explicitly requested in the query
* projection.
* <p>Type: NUMBER</p>
*/
public static final String PRESENCE_PROTOCOL = "presence_protocol";
/**
* Custom protocol that supplied the latest status update (see
* {@link CommonDataKinds.Im#CUSTOM_PROTOCOL}. This column is only
* returned if explicitly requested in the query projection.
* <p>Type: TEXT</p>
*/
public static final String PRESENCE_CUSTOM_PROTOCOL = "presence_custom_protocol";
/**
* An indicator of whether this contact has at least one phone number. "1" if there is
* at least one phone number, "0" otherwise.
@@ -878,6 +902,7 @@ public final class ContactsContract {
}
public static final class Presence implements PresenceColumns, Im.CommonPresenceColumns {
/**
* This utility class cannot be instantiated
*/
@@ -940,6 +965,12 @@ public final class ContactsContract {
* presence detail.
*/
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/im-presence";
/**
* The time when the presence custom status was inserted/updated.
* <p>Type: TEXT</p>
*/
public static final String PRESENCE_CUSTOM_STATUS_TIMESTAMP = "status_timestamp";
}
/**
@@ -1699,7 +1730,7 @@ public final class ContactsContract {
/**
* Thumbnail photo of the raw contact. This is the raw bytes of an image
* that could be inflated using {@link BitmapFactory}.
* that could be inflated using {@link android.graphics.BitmapFactory}.
* <p>
* Type: BLOB
*/