auto import from //branches/cupcake/...@137197
diff --git a/Android.mk b/Android.mk
index 9de5b56..ccda1eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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 @@
}
/**
- * 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 @@
// 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;
}