Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0b98c944: Fix code placement and comments for gtalk url scraping settings.

Browse Source 
Merge commit '0b98c944c6bac98d95c93916cde31f841b44d9aa' into eclair-plus-aosp

* commit '0b98c944c6bac98d95c93916cde31f841b44d9aa':
  Fix code placement and comments for gtalk url scraping settings.
This commit is contained in:
Ye Wen
2009-09-05 08:35:51 -07:00
committed by Android Git Automerger
parent 1e31ed013a 0b98c944c6
commit 21822728fe
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/provider/Settings.java
View File

@@ -2984,13 +2984,15 @@ public final class Settings {
"gtalk_max_conn_history_records"; "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 = public static final String GTALK_PICASA_ALBUM_URL =
"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 = public static final String GTALK_FLICKR_PHOTO_INFO_URL =
"gtalk_flickr_photo_info_url"; "gtalk_flickr_photo_info_url";
@@ -3002,11 +3004,18 @@ public final class Settings {
"gtalk_flickr_photo_url"; "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 = public static final String GTALK_YOUTUBE_VIDEO_URL =
"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). * Chat message lifetime (for pruning old chat messages).
*/ */
@@ -3031,12 +3040,6 @@ public final class Settings {
public static final String PUSH_MESSAGING_REGISTRATION_URL = public static final String PUSH_MESSAGING_REGISTRATION_URL =
"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. * Use android://<it> routing infos for Google Sync Server subcriptions.
*/ */