diff options
author | Leon Scroggins <scroggo@google.com> | 2010-01-21 09:53:49 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-21 09:53:49 -0800 |
commit | 90be8e2aaa6915fd3e8106bb3f2cd512d18d9369 (patch) | |
tree | 2a99255b15a4749a81d2a2cde4fb8d99cfa91ecf /src/com/android | |
parent | 4cf7de0e445d302b45338fd46ecaa0b52d664eee (diff) | |
parent | f08809b2cf7e502fef5965691a7fb6d7cf0322af (diff) | |
download | packages_apps_Browser-90be8e2aaa6915fd3e8106bb3f2cd512d18d9369.zip packages_apps_Browser-90be8e2aaa6915fd3e8106bb3f2cd512d18d9369.tar.gz packages_apps_Browser-90be8e2aaa6915fd3e8106bb3f2cd512d18d9369.tar.bz2 |
Merge "Do not show the downloads page without the user explicitly requesting it."
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/browser/BrowserActivity.java | 7 | ||||
-rw-r--r-- | src/com/android/browser/FetchUrlMimeType.java | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 0167a94..92e1968 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -2955,7 +2955,6 @@ public class BrowserActivity extends Activity } else { final Uri contentUri = getContentResolver().insert(Downloads.Impl.CONTENT_URI, values); - viewDownloads(contentUri); } } @@ -3529,10 +3528,10 @@ public class BrowserActivity extends Activity /* * This method is called as a result of the user selecting the options - * menu to see the download window, or when a download changes state. It - * shows the download window ontop of the current window. + * menu to see the download window. It shows the download window on top of + * the current window. */ - /* package */ void viewDownloads(Uri downloadRecord) { + private void viewDownloads(Uri downloadRecord) { Intent intent = new Intent(this, BrowserDownloadPage.class); intent.setData(downloadRecord); diff --git a/src/com/android/browser/FetchUrlMimeType.java b/src/com/android/browser/FetchUrlMimeType.java index 51f9873..9e34736 100644 --- a/src/com/android/browser/FetchUrlMimeType.java +++ b/src/com/android/browser/FetchUrlMimeType.java @@ -128,7 +128,6 @@ class FetchUrlMimeType extends AsyncTask<ContentValues, String, String> { // Start the download final Uri contentUri = mActivity.getContentResolver().insert(Downloads.Impl.CONTENT_URI, mValues); - mActivity.viewDownloads(contentUri); } } |