summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BrowserActivity.java
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-07-10 09:57:04 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-07-10 09:57:04 -0700
commitf450cd0d744da48a5bdd9cdb6cc23a2df8b31db4 (patch)
treec299d1eaef1009c19a404d2de8ea46469880e5a0 /src/com/android/browser/BrowserActivity.java
parent19b637ba3cc27281089c81451c247477c71d9150 (diff)
parentcf849950fe8ad5425ccd82b48b9a014dea8a288e (diff)
downloadpackages_apps_Browser-f450cd0d744da48a5bdd9cdb6cc23a2df8b31db4.tar.gz
packages_apps_Browser-f450cd0d744da48a5bdd9cdb6cc23a2df8b31db4.tar.bz2
packages_apps_Browser-f450cd0d744da48a5bdd9cdb6cc23a2df8b31db4.zip
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.
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
-rw-r--r--src/com/android/browser/BrowserActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index c69a115bf..95e199632 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1523,7 +1523,8 @@ public class BrowserActivity extends Activity
*/
@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;
}