diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/AddBookmarkPage.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserBookmarksPage.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserHistoryPage.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/DownloadHandler.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/FetchUrlMimeType.java | 3 | ||||
| -rw-r--r-- | src/com/android/browser/provider/BrowserProvider2.java | 4 |
6 files changed, 11 insertions, 8 deletions
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java index f5b677a..d3c147c 100644 --- a/src/com/android/browser/AddBookmarkPage.java +++ b/src/com/android/browser/AddBookmarkPage.java @@ -410,7 +410,7 @@ public class AddBookmarkPage extends Activity Folder thisFolder = folderStack.pop(); mCrumbs.pushView(thisFolder.Name, thisFolder); } - getLoaderManager().stopLoader(LOADER_ID_ALL_FOLDERS); + getLoaderManager().destroyLoader(LOADER_ID_ALL_FOLDERS); break; default: break; diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index 3fc270e..825da33 100644 --- a/src/com/android/browser/BrowserBookmarksPage.java +++ b/src/com/android/browser/BrowserBookmarksPage.java @@ -482,7 +482,7 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte } mCrumbs.setController(null); mCrumbs = null; - getLoaderManager().stopLoader(LOADER_BOOKMARKS); + getLoaderManager().destroyLoader(LOADER_BOOKMARKS); } @Override diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java index 01e3c21..d8e8177 100644 --- a/src/com/android/browser/BrowserHistoryPage.java +++ b/src/com/android/browser/BrowserHistoryPage.java @@ -224,8 +224,8 @@ public class BrowserHistoryPage extends Fragment public void onDestroy() { super.onDestroy(); CombinedBookmarkHistoryView.getIconListenerSet().removeListener(mIconReceiver); - getLoaderManager().stopLoader(LOADER_HISTORY); - getLoaderManager().stopLoader(LOADER_MOST_VISITED); + getLoaderManager().destroyLoader(LOADER_HISTORY); + getLoaderManager().destroyLoader(LOADER_MOST_VISITED); } @Override diff --git a/src/com/android/browser/DownloadHandler.java b/src/com/android/browser/DownloadHandler.java index cbf26f4..40278f4 100644 --- a/src/com/android/browser/DownloadHandler.java +++ b/src/com/android/browser/DownloadHandler.java @@ -183,7 +183,9 @@ public class DownloadHandler { Uri uri = Uri.parse(addressString); final DownloadManager.Request request = new DownloadManager.Request(uri); request.setMimeType(mimetype); - request.setDestinationInExternalFilesDir(activity, null, filename); + // set downloaded file destination to /sdcard/Download. + // or, should it be set to one of several Environment.DIRECTORY* dirs depending on mimetype? + request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename); // let this downloaded file be scanned by MediaScanner - so that it can // show up in Gallery app, for example. request.allowScanningByMediaScanner(); diff --git a/src/com/android/browser/FetchUrlMimeType.java b/src/com/android/browser/FetchUrlMimeType.java index 2538d90..85c588e 100644 --- a/src/com/android/browser/FetchUrlMimeType.java +++ b/src/com/android/browser/FetchUrlMimeType.java @@ -27,6 +27,7 @@ import android.app.DownloadManager; import android.content.Context; import android.net.Proxy; import android.net.http.AndroidHttpClient; +import android.os.Environment; import android.webkit.MimeTypeMap; import android.webkit.URLUtil; @@ -116,7 +117,7 @@ class FetchUrlMimeType extends Thread { } String filename = URLUtil.guessFileName(mUri, contentDisposition, mimeType); - mRequest.setDestinationInExternalFilesDir(mActivity, null, filename); + mRequest.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename); } // Start the download diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java index 19d508d..849426a 100644 --- a/src/com/android/browser/provider/BrowserProvider2.java +++ b/src/com/android/browser/provider/BrowserProvider2.java @@ -565,8 +565,10 @@ public class BrowserProvider2 extends SQLiteContentProvider { public String getType(Uri uri) { final int match = URI_MATCHER.match(uri); switch (match) { + case LEGACY: case BOOKMARKS: return Bookmarks.CONTENT_TYPE; + case LEGACY_ID: case BOOKMARKS_ID: return Bookmarks.CONTENT_ITEM_TYPE; case HISTORY: @@ -577,8 +579,6 @@ public class BrowserProvider2 extends SQLiteContentProvider { return Searches.CONTENT_TYPE; case SEARCHES_ID: return Searches.CONTENT_ITEM_TYPE; -// case SUGGEST: -// return SearchManager.SUGGEST_MIME_TYPE; } return null; } |