Merge change 22795 into eclair

* changes:
  The Gservices settings for pruning messages/chats.
This commit is contained in:
Android (Google) Code Review
2009-08-27 10:58:25 -07:00

View File

@@ -2967,16 +2967,34 @@ public final class Settings {
public static final String GTALK_YOUTUBE_VIDEO_URL =
"gtalk_youtube_video_url";
/**
* Chat message lifetime (for pruning old chat messages).
*/
public static final String GTALK_CHAT_MESSAGE_LIFETIME =
"gtalk_chat_message_lifetime";
/**
* OTR message lifetime (for pruning old otr messages).
*/
public static final String GTALK_OTR_MESSAGE_LIFETIME =
"gtalk_otr_message_lifetime";
/**
* Chat expiration time, i.e., time since last message in the chat (for pruning old chats).
*/
public static final String GTALK_CHAT_EXPIRATION_TIME =
"gtalk_chat_expiration_time";
/**
* This is the url for getting the app token for server-to-device push messaging.
*/
public static final String PUSH_MESSAGING_REGISTRATION_URL =
"push_messaging_registration_url";
/**
* Use android://<it> routing infos for Google Sync Server subcriptions.
*/
public static final String GSYNC_USE_RMQ2_ROUTING_INFO = "gsync_use_rmq2_routing_info";
/**
* Use android://<it> routing infos for Google Sync Server subcriptions.
*/
public static final String GSYNC_USE_RMQ2_ROUTING_INFO = "gsync_use_rmq2_routing_info";
/**
* Enable use of ssl session caching.