commit 40411f008112113e769722d8d3ef8da0ef571df6
author John Reck <jreck@google.com> Fri Dec 10 12:53:18 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 10 12:53:18 2010 -0800
tree 28d65251bad6fbccaf4dbf73f92b1d03efc71ca8
parent b6bc32c9c6ed3ec90d602a729a7bfa7741896cf4
parent 1cebb445779da9ca597621c79b020d6e5ea54fb2

Merge "Removed 'Other Bookmarks' context menu"

src/com/android/browser/BookmarkUtils.java

diff --git a/src/com/android/browser/BookmarkUtils.java b/src/com/android/browser/BookmarkUtils.java
index c72cbd1..58622ce 100644
--- a/src/com/android/browser/BookmarkUtils.java
+++ b/src/com/android/browser/BookmarkUtils.java
@@ -170,16 +170,21 @@
     }
 
     /* package */ static Uri getBookmarksUri(Context context) {
+        return addAccountInfo(context,
+                BrowserContract.Bookmarks.CONTENT_URI.buildUpon()).build();
+    }
+
+    /* package */ static Uri.Builder addAccountInfo(Context context, Uri.Builder ub) {
         Uri uri = BrowserContract.Bookmarks.CONTENT_URI;
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         String accountType = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null);
         String accountName = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, null);
         if (!TextUtils.isEmpty(accountName) && !TextUtils.isEmpty(accountType)) {
-            uri = uri.buildUpon()
-                    .appendQueryParameter(BrowserContract.Bookmarks.PARAM_ACCOUNT_NAME, accountName)
-                    .appendQueryParameter(BrowserContract.Bookmarks.PARAM_ACCOUNT_TYPE, accountType)
-                    .build();
+            ub.appendQueryParameter(
+                    BrowserContract.Bookmarks.PARAM_ACCOUNT_NAME,accountName);
+            ub.appendQueryParameter(
+                    BrowserContract.Bookmarks.PARAM_ACCOUNT_TYPE, accountType);
         }
-        return uri;
+        return ub;
     }
-};
+}

src/com/android/browser/IntentHandler.java

diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index 0b47668..6e0236f 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -276,7 +276,7 @@
     private static boolean handleWebSearchRequest(Activity activity,
             Controller controller, String inUrl, Bundle appData,
             String extraData) {
-        if (inUrl == null) return false;
+        if (TextUtils.isEmpty(inUrl)) return false;
 
         // In general, we shouldn't modify URL from Intent.
         // But currently, we get the user-typed URL from search box as well.

src/com/android/browser/SuggestionsAdapter.java

diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index 8c06353..6473dfd 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -498,10 +498,12 @@
             Uri.Builder ub = BrowserContract.Combined.CONTENT_URI.buildUpon();
             ub.appendQueryParameter(BrowserContract.PARAM_LIMIT,
                     Integer.toString(mLinesPortrait));
+            BookmarkUtils.addAccountInfo(mContext, ub);
             mCursor =
                     mContext.getContentResolver().query(ub.build(), COMBINED_PROJECTION,
                             selection,
                             (constraint != null) ? args : null,
+                            BrowserContract.Combined.IS_BOOKMARK + " DESC, " +
                             BrowserContract.Combined.VISITS + " DESC, " +
                             BrowserContract.Combined.DATE_LAST_VISITED + " DESC");
             if (mCursor != null) {

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 5326280..99e86c4 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -33,6 +33,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
+import android.webkit.WebView;
 import android.widget.ImageView;
 
 /**
@@ -186,10 +187,16 @@
 
     @Override
     public void onDismiss() {
-        mUiController.getCurrentTopWebView().requestFocus();
+        WebView top = mUiController.getCurrentTopWebView();
+        if (top != null) {
+            mUiController.getCurrentTopWebView().requestFocus();
+        }
         ((BaseUi) mUiController.getUi()).hideFakeTitleBar();
         setUrlMode(false);
-        setDisplayTitle(mUiController.getCurrentWebView().getUrl());
+        // if top != null current must be set
+        if (top != null) {
+            setDisplayTitle(mUiController.getCurrentWebView().getUrl());
+        }
     }
 
     @Override