From 0b98c944c6bac98d95c93916cde31f841b44d9aa Mon Sep 17 00:00:00 2001 From: Ye Wen Date: Fri, 4 Sep 2009 23:43:47 -0700 Subject: [PATCH] Fix code placement and comments for gtalk url scraping settings. --- core/java/android/provider/Settings.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5d0b5a624f399..5bc58559e36a8 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2984,13 +2984,15 @@ public final class Settings { "gtalk_max_conn_history_records"; /** - * This is gdata url to lookup album and picture info from picasa web. + * This is gdata url to lookup album and picture info from picasa web. It also controls + * whether url scraping for picasa is enabled (NULL to disable). */ public static final String GTALK_PICASA_ALBUM_URL = "gtalk_picasa_album_url"; /** - * This is the url to lookup picture info from flickr. + * This is the url to lookup picture info from flickr. It also controls + * whether url scraping for flickr is enabled (NULL to disable). */ public static final String GTALK_FLICKR_PHOTO_INFO_URL = "gtalk_flickr_photo_info_url"; @@ -3002,11 +3004,18 @@ public final class Settings { "gtalk_flickr_photo_url"; /** - * This is the gdata url to lookup info on a youtube video. + * This is the gdata url to lookup info on a youtube video. It also controls + * whether url scraping for youtube is enabled (NULL to disable). */ public static final String GTALK_YOUTUBE_VIDEO_URL = "gtalk_youtube_video_url"; + /** + * Enable/disable GTalk URL scraping for JPG images ("true" to enable). + */ + public static final String GTALK_URL_SCRAPING_FOR_JPG = + "gtalk_url_scraping_for_jpg"; + /** * Chat message lifetime (for pruning old chat messages). */ @@ -3031,12 +3040,6 @@ public final class Settings { public static final String PUSH_MESSAGING_REGISTRATION_URL = "push_messaging_registration_url"; - /** - * Enable/disable GTalk URL scraping for JPG images. - */ - public static final String GTALK_URL_SCRAPING_FOR_JPG = - "gtalk_url_scraping_for_jpg"; - /** * Use android://<it> routing infos for Google Sync Server subcriptions. */