commit f450cd0d744da48a5bdd9cdb6cc23a2df8b31db4
author Grace Kloba <klobag@google.com> Fri Jul 10 09:57:04 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Jul 10 09:57:04 2009 -0700
tree c299d1eaef1009c19a404d2de8ea46469880e5a0
parent 19b637ba3cc27281089c81451c247477c71d9150
parent cf849950fe8ad5425ccd82b48b9a014dea8a288e

am cf849950: Fix 1970279. Like "Go", search key should get the current url and pre-fill it in the search/goto widget.

Merge commit 'cf849950fe8ad5425ccd82b48b9a014dea8a288e'

* commit 'cf849950fe8ad5425ccd82b48b9a014dea8a288e':
  Fix 1970279. Like "Go", search key should get the current url and pre-fill it in the search/goto widget.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index c69a115..95e1996 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1523,7 +1523,8 @@
      */
     @Override
     public boolean onSearchRequested() {
-        startSearch(null, false,
+        String url = getTopWindow().getUrl();
+        startSearch(mSettings.getHomePage().equals(url) ? null : url, false,
                 createGoogleSearchSourceBundle(GOOGLE_SEARCH_SOURCE_SEARCHKEY), false);
         return true;
     }