commit 1e9815d4c4864790fde2ad1e216058f922060c92
author John Reck <jreck@google.com> Mon Aug 08 17:45:05 2011 -0700
committer John Reck <jreck@google.com> Mon Aug 08 17:45:05 2011 -0700
tree 517138f7f52b174f85aebcc786160a03db7fd1d0
parent e28b347fcc1df6e6bd41cb294d521a4f1e7c5c75

Move local bookmarks to end of Bookmark page

 Bug: 5136280
 Also hide empty accounts in the bookmark page

Change-Id: I39067b5325d24c7ebf41df88c6231c411983fc57

src/com/android/browser/BrowserBookmarksPage.java

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 0c76a70..a03590b 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -41,7 +41,6 @@
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -54,6 +53,7 @@
 
 import com.android.browser.BookmarkDragHandler.BookmarkDragController;
 import com.android.browser.BookmarkDragHandler.BookmarkDragState;
+import com.android.browser.provider.BrowserProvider2;
 import com.android.browser.view.BookmarkExpandableView;
 import com.android.browser.view.BookmarkExpandableView.BookmarkContextMenuInfo;
 
@@ -619,8 +619,11 @@
         };
 
         public AccountsLoader(Context context) {
-            super(context, Accounts.CONTENT_URI, ACCOUNTS_PROJECTION, null, null,
-                    Accounts.ACCOUNT_NAME + " ASC");
+            super(context, Accounts.CONTENT_URI
+                    .buildUpon()
+                    .appendQueryParameter(BrowserProvider2.PARAM_ALLOW_EMPTY_ACCOUNTS, "false")
+                    .build(),
+                    ACCOUNTS_PROJECTION, null, null, null);
         }
 
     }