summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/provider
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-04-12 17:27:34 -0700
committerJohn Reck <jreck@google.com>2012-04-12 17:30:09 -0700
commitd18ac4b36b057a6a403cb060dfc10761b7394548 (patch)
tree66e83cef9ad5a60bc1b1848daa22c46ae6417799 /src/com/android/browser/provider
parent80f750852edf43c6b09e5633f2c6ebdb2ed94a5b (diff)
downloadpackages_apps_Browser-d18ac4b36b057a6a403cb060dfc10761b7394548.zip
packages_apps_Browser-d18ac4b36b057a6a403cb060dfc10761b7394548.tar.gz
packages_apps_Browser-d18ac4b36b057a6a403cb060dfc10761b7394548.tar.bz2
Support BOOKMARK_TYPE
Bug: 6332869 Bug: 5494697 Bookmark type also gives us an easy way to localize Other Bookmarks Change-Id: Iab208da0cb1b2af5d256990cdc4ab5c11821523b
Diffstat (limited to 'src/com/android/browser/provider')
-rw-r--r--src/com/android/browser/provider/BrowserProvider2.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index 6121abc..a66c333 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -284,6 +284,17 @@ public class BrowserProvider2 extends SQLiteContentProvider {
" FROM " + TABLE_BOOKMARKS + " A WHERE " +
"A." + Bookmarks._ID + "=" + TABLE_BOOKMARKS + "." + Bookmarks.INSERT_AFTER +
") AS " + Bookmarks.INSERT_AFTER_SOURCE_ID);
+ map.put(Bookmarks.TYPE, "CASE "
+ + " WHEN " + Bookmarks.IS_FOLDER + "=0 THEN "
+ + Bookmarks.BOOKMARK_TYPE_BOOKMARK
+ + " WHEN " + ChromeSyncColumns.SERVER_UNIQUE + "='"
+ + ChromeSyncColumns.FOLDER_NAME_BOOKMARKS_BAR + "' THEN "
+ + Bookmarks.BOOKMARK_TYPE_BOOKMARK_BAR_FOLDER
+ + " WHEN " + ChromeSyncColumns.SERVER_UNIQUE + "='"
+ + ChromeSyncColumns.FOLDER_NAME_OTHER_BOOKMARKS + "' THEN "
+ + Bookmarks.BOOKMARK_TYPE_OTHER_FOLDER
+ + " ELSE " + Bookmarks.BOOKMARK_TYPE_FOLDER
+ + " END AS " + Bookmarks.TYPE);
// Other bookmarks
OTHER_BOOKMARKS_PROJECTION_MAP.putAll(BOOKMARKS_PROJECTION_MAP);