am ff0ea5ea: Merge "Support for download manager "queue for wifi" dialogs" into gingerbread

Merge commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f' into gingerbread-plus-aosp

* commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f':
  Support for download manager "queue for wifi" dialogs
This commit is contained in:
Steve Howard
2010-09-21 13:02:06 -07:00
committed by Android Git Automerger
2 changed files with 17 additions and 0 deletions

View File

@@ -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.
*/

View File

@@ -3427,6 +3427,15 @@ public final class Settings {
public static final String DOWNLOAD_MAX_BYTES_OVER_MOBILE =
"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