Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff0ea5ea authored by Steve Howard's avatar Steve Howard Committed by Android (Google) Code Review
Browse files

Merge "Support for download manager "queue for wifi" dialogs" into gingerbread

parents 0859b764 f176681e

core/java/android/provider/Downloads.java

+8 −0
Original line number Diff line number Diff line
@@ -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.

         */

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -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