commit a9bad830efad4c098e6f874704dedc005958aedf
author Jeff Hamilton <jham@android.com> Fri Sep 24 11:05:30 2010 -0500
committer Jeff Hamilton <jham@android.com> Tue Sep 28 20:55:15 2010 -0500
tree 1284b501080556e799074b4cccc35a4b7f6d1b10
parent 4952a2f98dfb7e37949e2a598fc8bbcfd4248169

Add settings to enable bookmarks sync.

Change-Id: I86bc4ce9d21ec0a040322bd704cef46eaa17dc9c

src/com/android/browser/AddBookmarkPage.java

diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 77f8ea8..5da4d2a 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -213,7 +213,7 @@
                         BrowserContract.Bookmarks.TITLE);
                 int parentIndex = cursor.getColumnIndexOrThrow(
                         BrowserContract.Bookmarks.PARENT);
-                while (parent != BrowserProvider2.FIXED_ID_BOOKMARKS_BAR) {
+                while (parent != BrowserProvider2.FIXED_ID_ROOT) {
                     // First, find the folder corresponding to the current
                     // folder
                     if (!cursor.moveToFirst()) {
@@ -350,7 +350,7 @@
         list.setAdapter(mAdapter);
         list.setOnItemClickListener(this);
         LoaderManager manager = getLoaderManager();
-        if (mCurrentFolder != BrowserProvider2.FIXED_ID_BOOKMARKS_BAR) {
+        if (mCurrentFolder != BrowserProvider2.FIXED_ID_ROOT) {
             // Find all the folders
             manager.initLoader(LOADER_ID_ALL_FOLDERS, null, this);
         }
@@ -371,7 +371,7 @@
         String accountType =
                 prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null);
         if (TextUtils.isEmpty(accountName) || TextUtils.isEmpty(accountType)) {
-            return BrowserProvider2.FIXED_ID_BOOKMARKS_BAR;
+            return BrowserProvider2.FIXED_ID_ROOT;
         }
         Cursor cursor = null;
         try {
@@ -393,7 +393,7 @@
         } finally {
             if (cursor != null) cursor.close();
         }
-        return BrowserProvider2.FIXED_ID_BOOKMARKS_BAR;
+        return BrowserProvider2.FIXED_ID_ROOT;
     }
 
     @Override