commit e915522070010656582d4c651ab74b1ac4a94ac5
author John Reck <jreck@google.com> Fri Nov 11 15:13:52 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 11 15:13:52 2011 +0000
tree b0b8cc2a76f4599b2251508915dd21b20e5cc0bb
parent dc4a854fff59cfc3e52f438c97f0a15adbf21b19
parent 4409358ac603ec61f42a1b40f90d8b2893d9ad0b

am 4409358a: Merge "Special case the root folder in add bookmarks" into ics-mr1

* commit '4409358ac603ec61f42a1b40f90d8b2893d9ad0b':
  Special case the root folder in add bookmarks

src/com/android/browser/AddBookmarkPage.java

diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index ae5ae69..fdb34c4 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -145,6 +145,13 @@
     }
 
     private Uri getUriForFolder(long folder) {
+        BookmarkAccount account =
+                (BookmarkAccount) mAccountSpinner.getSelectedItem();
+        if (folder == mRootFolder && account != null) {
+            return BookmarksLoader.addAccount(
+                    BrowserContract.Bookmarks.CONTENT_URI_DEFAULT_FOLDER,
+                    account.accountType, account.accountName);
+        }
         return BrowserContract.Bookmarks.buildFolderUri(folder);
     }
 
@@ -437,8 +444,8 @@
             BookmarkAccount account = mAccountAdapter.getItem(i);
             if (TextUtils.equals(account.accountName, accountName)
                     && TextUtils.equals(account.accountType, accountType)) {
-                onRootFolderFound(account.rootFolderId);
                 mAccountSpinner.setSelection(i);
+                onRootFolderFound(account.rootFolderId);
                 return;
             }
         }