diff options
| author | Ye Wen <ywen@google.com> | 2009-09-04 23:43:47 -0700 |
|---|---|---|
| committer | Ye Wen <ywen@google.com> | 2009-09-04 23:43:47 -0700 |
| commit | 0b98c944c6bac98d95c93916cde31f841b44d9aa (patch) | |
| tree | 3ac38ef699c906990ba85f79f33599928820d1d3 | |
| parent | 981871922ded799f51b7b8a3e53028d70f37e65c (diff) | |
| download | frameworks_base-0b98c944c6bac98d95c93916cde31f841b44d9aa.zip frameworks_base-0b98c944c6bac98d95c93916cde31f841b44d9aa.tar.gz frameworks_base-0b98c944c6bac98d95c93916cde31f841b44d9aa.tar.bz2 | |
Fix code placement and comments for gtalk url scraping settings.
| -rw-r--r-- | core/java/android/provider/Settings.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5d0b5a6..5bc5855 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,12 +3004,19 @@ 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). */ public static final String GTALK_CHAT_MESSAGE_LIFETIME = @@ -3032,12 +3041,6 @@ public final class Settings { "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. */ public static final String GSYNC_USE_RMQ2_ROUTING_INFO = "gsync_use_rmq2_routing_info"; |