commit d18ac4b36b057a6a403cb060dfc10761b7394548
author John Reck <jreck@google.com> Thu Apr 12 17:27:34 2012 -0700
committer John Reck <jreck@google.com> Thu Apr 12 17:30:09 2012 -0700
tree 66e83cef9ad5a60bc1b1848daa22c46ae6417799
parent 80f750852edf43c6b09e5633f2c6ebdb2ed94a5b

Support BOOKMARK_TYPE

 Bug: 6332869
 Bug: 5494697
 Bookmark type also gives us an easy way to localize Other Bookmarks

Change-Id: Iab208da0cb1b2af5d256990cdc4ab5c11821523b

src/com/android/browser/BrowserBookmarksPage.java

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index da60fda..2c8a27a 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -37,7 +37,6 @@
 import android.os.Bundle;
 import android.provider.BrowserContract;
 import android.provider.BrowserContract.Accounts;
-import android.provider.BrowserContract.ChromeSyncColumns;
 import android.view.ActionMode;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -285,8 +284,9 @@
     }
 
     boolean canEdit(Cursor c) {
-        String unique = c.getString(BookmarksLoader.COLUMN_INDEX_SERVER_UNIQUE);
-        return !ChromeSyncColumns.FOLDER_NAME_OTHER_BOOKMARKS.equals(unique);
+        int type = c.getInt(BookmarksLoader.COLUMN_INDEX_TYPE);
+        return type == BrowserContract.Bookmarks.BOOKMARK_TYPE_BOOKMARK
+                || type == BrowserContract.Bookmarks.BOOKMARK_TYPE_FOLDER;
     }
 
     private void populateBookmarkItem(Cursor cursor, BookmarkItem item, boolean isFolder) {