diff options
| author | Steve Howard <showard@google.com> | 2010-09-21 12:49:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-21 12:49:36 -0700 |
| commit | ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f (patch) | |
| tree | 1b3f83b75fd1cd64245dacb1ba288dd84f258ac3 /core | |
| parent | 0859b764719735e4b9aea5df6051ece13e212841 (diff) | |
| parent | f176681ecc19f3bffa3d9cb00b3460cf5a128d28 (diff) | |
| download | frameworks_base-ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f.zip frameworks_base-ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f.tar.gz frameworks_base-ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f.tar.bz2 | |
Merge "Support for download manager "queue for wifi" dialogs" into gingerbread
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Downloads.java | 8 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java index 871a044..1e358c9 100644 --- a/core/java/android/provider/Downloads.java +++ b/core/java/android/provider/Downloads.java @@ -895,6 +895,14 @@ public final class Downloads { */ public static final String COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI = "is_visible_in_downloads_ui"; + /** + * If true, the user has confirmed that this download can proceed over the mobile network + * even though it exceeds the recommended maximum size. + * <P>Type: BOOLEAN</P> + */ + public static final String COLUMN_BYPASS_RECOMMENDED_SIZE_LIMIT = + "bypass_recommended_size_limit"; + /* * Lists the destinations that an application can specify for a download. */ diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index fd60115..69151df 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3428,6 +3428,15 @@ public final class Settings { "download_manager_max_bytes_over_mobile"; /** + * The recommended maximum size, in bytes, of a download that the download manager should + * transfer over a non-wifi connection. Over this size, the use will be warned, but will + * have the option to start the download over the mobile connection anyway. + * @hide + */ + public static final String DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE = + "download_manager_recommended_max_bytes_over_mobile"; + + /** * ms during which to consume extra events related to Inet connection condition * after a transtion to fully-connected * @hide |