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

am 98187192: Merge change 24014 into eclair

Browse Source 
Merge commit '981871922ded799f51b7b8a3e53028d70f37e65c' into eclair-plus-aosp

* commit '981871922ded799f51b7b8a3e53028d70f37e65c':
  Gservices settings for controlling URL scraping in GTalk app.
This commit is contained in:
Ye Wen
2009-09-04 22:52:58 -07:00
committed by Android Git Automerger
parent 28be8886af 981871922d
commit 1e31ed013a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3031,6 +3031,12 @@ 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.
*/ */