summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorCedric Beust <>2009-03-24 22:35:42 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 22:35:42 -0700
commitafb6c8eafc96dcee4d2fa465eb5a2eba6b38f36f (patch)
tree6552eea9129812f528f7b112703d5806f7c669c0 /core
parent062a75be9c1618c07d5a3b322d7b09f3d83dc7a1 (diff)
downloadframeworks_base-afb6c8eafc96dcee4d2fa465eb5a2eba6b38f36f.zip
frameworks_base-afb6c8eafc96dcee4d2fa465eb5a2eba6b38f36f.tar.gz
frameworks_base-afb6c8eafc96dcee4d2fa465eb5a2eba6b38f36f.tar.bz2
Automated import from //branches/master/...@142319,142319
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/Settings.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index b0ee479..68eeccd 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2314,6 +2314,11 @@ public final class Settings {
public static final String GMAIL_DISALLOW_IMAGE_PREVIEWS = "gmail_disallow_image_previews";
/**
+ * The maximal size in bytes allowed for attachments when composing messages in Gmail
+ */
+ public static final String GMAIL_MAX_ATTACHMENT_SIZE = "gmail_max_attachment_size_bytes";
+
+ /**
* The timeout in milliseconds that Gmail uses when opening a connection and reading
* from it. A missing value or a value of -1 instructs Gmail to use the defaults provided
* by GoogleHttpClient.