auto import from //branches/cupcake/...@137197

Android.mk

 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.

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;
     }
 

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;
     }