diff options
-rw-r--r-- | src/com/android/browser/BrowserBookmarksPage.java | 16 | ||||
-rw-r--r-- | src/com/android/browser/CombinedBookmarkHistoryView.java | 2 | ||||
-rw-r--r-- | src/com/android/browser/Controller.java | 6 | ||||
-rw-r--r-- | src/com/android/browser/TitleBarXLarge.java | 3 | ||||
-rw-r--r-- | src/com/android/browser/UiController.java | 2 |
5 files changed, 5 insertions, 24 deletions
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index d4d1c0dc..f92272fb 100644 --- a/src/com/android/browser/BrowserBookmarksPage.java +++ b/src/com/android/browser/BrowserBookmarksPage.java @@ -170,22 +170,6 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte // TODO: Figure out what to do here (if anything?) } - long getFolderId() { - LoaderManager manager = getLoaderManager(); - BookmarksLoader loader = - (BookmarksLoader) ((Loader<?>)manager.getLoader(LOADER_BOOKMARKS)); - - Uri uri = loader.getUri(); - if (uri != null) { - try { - return ContentUris.parseId(uri); - } catch (NumberFormatException nfx) { - return -1; - } - } - return -1; - } - @Override public boolean onContextItemSelected(MenuItem item) { BookmarkContextMenuInfo i = (BookmarkContextMenuInfo)item.getMenuInfo(); diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java index 1fdc2606..785b2cdd 100644 --- a/src/com/android/browser/CombinedBookmarkHistoryView.java +++ b/src/com/android/browser/CombinedBookmarkHistoryView.java @@ -312,7 +312,7 @@ public class CombinedBookmarkHistoryView extends LinearLayout mUiController.onUrlSelected(settings.getHomePage(), false); return true; case R.id.add_bookmark: - mUiController.bookmarkCurrentPage(mBookmarks.getFolderId(), false); + mUiController.bookmarkCurrentPage(false); return true; case R.id.preferences_menu_id: Intent intent = new Intent(mActivity, BrowserPreferencesPage.class); diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 986b6174..9472b417 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1555,7 +1555,7 @@ public class Controller break; case R.id.add_bookmark_menu_id: - bookmarkCurrentPage(AddBookmarkPage.DEFAULT_FOLDER_ID, false); + bookmarkCurrentPage(false); break; case R.id.stop_reload_menu_id: @@ -1907,7 +1907,7 @@ public class Controller * existing bookmark. */ @Override - public void bookmarkCurrentPage(long folderId, boolean canBeAnEdit) { + public void bookmarkCurrentPage(boolean canBeAnEdit) { Intent i = new Intent(mActivity, AddBookmarkPage.class); WebView w = getCurrentTopWebView(); @@ -1926,8 +1926,6 @@ public class Controller createScreenshot(w, getDesiredThumbnailWidth(mActivity), getDesiredThumbnailHeight(mActivity))); i.putExtra(BrowserContract.Bookmarks.FAVICON, w.getFavicon()); - i.putExtra(BrowserContract.Bookmarks.PARENT, - folderId); if (canBeAnEdit) { i.putExtra(AddBookmarkPage.CHECK_FOR_DUPE, true); } diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java index 91709ccf..69f69493 100644 --- a/src/com/android/browser/TitleBarXLarge.java +++ b/src/com/android/browser/TitleBarXLarge.java @@ -165,8 +165,7 @@ public class TitleBarXLarge extends TitleBarBase } else if (mForwardButton == v) { mUiController.getCurrentTopWebView().goForward(); } else if (mStar == v) { - mUiController.bookmarkCurrentPage( - AddBookmarkPage.DEFAULT_FOLDER_ID, true); + mUiController.bookmarkCurrentPage(true); } else if (mAllButton == v) { mUiController.bookmarksOrHistoryPicker(false); } else if (mSearchButton == v) { diff --git a/src/com/android/browser/UiController.java b/src/com/android/browser/UiController.java index 4fc37afd..05eaf8e8 100644 --- a/src/com/android/browser/UiController.java +++ b/src/com/android/browser/UiController.java @@ -57,7 +57,7 @@ public interface UiController extends BookmarksHistoryCallbacks { void stopLoading(); - void bookmarkCurrentPage(long folderId, boolean canBeAnEdit); + void bookmarkCurrentPage(boolean canBeAnEdit); void bookmarksOrHistoryPicker(boolean openHistory); |