Merge change 22331 into eclair

* changes:
  add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.

core/java/android/provider/Im.java

@@ -931,6 +931,12 @@ public class Im {
          * <P>Type: INTEGER</P>
          */
         String IS_GROUP_CHAT = "is_muc";
+
+        /**
+         * A hint that the UI should show the sent time of this message
+         * <P>Type: INTEGER</P>
+         */
+        String DISPLAY_SENT_TIME = "show_ts";
     }
 
     /**

core/java/android/provider/Settings.java

@@ -2929,6 +2929,21 @@ public final class Settings {
         public static final String GTALK_RMQ2_INCLUDE_STREAM_ID =
                 "gtalk_rmq2_include_stream_id";
 
+        /**
+         * when receiving a chat message from the server, the message could be an older message
+         * whose "time sent" is x seconds from now. If x is significant enough, we want to flag
+         * it so the UI can give it some special treatment when displaying the "time sent" for
+         * it. This setting is to control what x is.
+         */
+        public static final String GTALK_OLD_CHAT_MESSAGE_THREADHOLD_IN_SEC =
+                "gtalk_old_chat_msg_threadhold_in_sec";
+
+        /**
+         * a setting to control the max connection history record GTalkService stores.
+         */
+        public static final String GTALK_MAX_CONNECTION_HISTORY_RECORDS =
+                "gtalk_max_conn_history_records";
+
         /**
          * This is gdata url to lookup album and picture info from picasa web.
          */