diff options
| author | Ye Wen <ywen@google.com> | 2009-08-27 11:02:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-27 11:02:59 -0700 |
| commit | 900e50e43bf895e75558a6b482971a8bdbd99502 (patch) | |
| tree | e423be1a791821b230c1c3eadd6b0dc438f2ce80 | |
| parent | 4bec2cfa2596aecc53946d1817f1d743d16736d6 (diff) | |
| parent | 0b05e730fe45e7dd22113a8c89cff879d7a3d53c (diff) | |
| download | frameworks_base-900e50e43bf895e75558a6b482971a8bdbd99502.zip frameworks_base-900e50e43bf895e75558a6b482971a8bdbd99502.tar.gz frameworks_base-900e50e43bf895e75558a6b482971a8bdbd99502.tar.bz2 | |
am 0b05e730: am 4d5b4225: Merge change 22795 into eclair
Merge commit '0b05e730fe45e7dd22113a8c89cff879d7a3d53c'
* commit '0b05e730fe45e7dd22113a8c89cff879d7a3d53c':
The Gservices settings for pruning messages/chats.
| -rw-r--r-- | core/java/android/provider/Settings.java | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9e3008b..77d1740 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2968,15 +2968,33 @@ public final class Settings { "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. |