diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-09 11:52:14 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-09 11:52:14 -0700 |
| commit | 4e5f58704099c37186d4825c3d55ea5b0527867f (patch) | |
| tree | c93c2860c18064123605dcd4ae19885a3d17dbf5 | |
| parent | 25a828a4300eb39580c2dea96d18624016d1a4ad (diff) | |
| download | packages_apps_Browser-4e5f58704099c37186d4825c3d55ea5b0527867f.zip packages_apps_Browser-4e5f58704099c37186d4825c3d55ea5b0527867f.tar.gz packages_apps_Browser-4e5f58704099c37186d4825c3d55ea5b0527867f.tar.bz2 | |
auto import from //branches/cupcake/...@137197
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 5 | ||||
| -rw-r--r-- | src/com/android/browser/TabControl.java | 2 |
3 files changed, 5 insertions, 4 deletions
@@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user development +LOCAL_MODULE_TAGS := user # TODO: Remove dependency of application on the test runner (android.test.runner) # library. diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 53640e5..40dbdf0 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -1289,13 +1289,12 @@ public class BrowserActivity extends Activity } /** - * Overriding this forces the search key to launch global search. The difference - * is the final "true" which requests global search. + * Overriding this to insert a local information bundle */ @Override public boolean onSearchRequested() { startSearch(null, false, - createGoogleSearchSourceBundle(GOOGLE_SEARCH_SOURCE_SEARCHKEY), true); + createGoogleSearchSourceBundle(GOOGLE_SEARCH_SOURCE_SEARCHKEY), false); return true; } diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java index 2f39302..57e55c4 100644 --- a/src/com/android/browser/TabControl.java +++ b/src/com/android/browser/TabControl.java @@ -423,6 +423,8 @@ class TabControl { // Create a new tab and add it to the tab list Tab t = new Tab(w, closeOnExit); mTabs.add(t); + // Initially put the tab in the background. + putTabInBackground(t); return t; } |