summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorWei Huang <weih@google.com>2009-06-19 13:08:39 -0700
committerWei Huang <weih@google.com>2009-06-22 10:08:22 -0700
commitceca25fdb019ef11e28b88e4575e6594cc46b55d (patch)
treeeb8392fd1fd6a907577b446dbaaaad6303e5ab4e /core/java
parenteed76b2a8ddc41af01cd3ae87c4722f3784c975c (diff)
downloadframeworks_base-ceca25fdb019ef11e28b88e4575e6594cc46b55d.zip
frameworks_base-ceca25fdb019ef11e28b88e4575e6594cc46b55d.tar.gz
frameworks_base-ceca25fdb019ef11e28b88e4575e6594cc46b55d.tar.bz2
add GServices settings for Google Talk privacy and legal urls.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9246445..2aa6640 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2529,6 +2529,21 @@ public final class Settings {
public static final String GMAIL_DISCARD_ERROR_UPHILL_OP = "gmail_discard_error_uphill_op";
/**
+ * the transcoder URL for mobile devices.
+ */
+ public static final String TRANSCODER_URL = "mobile_transcoder_url";
+
+ /**
+ * URL that points to the privacy terms of the Google Talk service.
+ */
+ public static final String GTALK_PRIVACY_URL = "gtalk_privacy_url";
+
+ /**
+ * URL that points to the legal terms of the Google Talk service.
+ */
+ public static final String GTALK_LEGAL_URL = "gtalk_legal_url";
+
+ /**
* Hostname of the GTalk server.
*/
public static final String GTALK_SERVICE_HOSTNAME = "gtalk_hostname";