Make the Combined Bookmark and History Activity use the BrowserActivity as it's search provider so that we can start typing on the bookmarks page and perform a search/URL load.

Change-Id: Ic05a19fab3ddccd99c5a07c6c9c10b85c791717a

2 files changed, 4 insertions, 0 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c408d3..3d970ab 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -116,6 +116,8 @@
         <activity android:name="CombinedBookmarkHistoryActivity" android:label=""
                   android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden"
                   android:theme="@style/BookmarkTheme" >
+            <meta-data android:name="android.app.default_searchable"
+                    android:value=".BrowserActivity" />
         </activity>
 
         <activity android:name="BrowserBookmarksPage" android:label="@string/bookmarks"
diff --git a/src/com/android/browser/CombinedBookmarkHistoryActivity.java b/src/com/android/browser/CombinedBookmarkHistoryActivity.java
index 25bc0e2..a611d79 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryActivity.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryActivity.java
@@ -79,6 +79,8 @@ public class CombinedBookmarkHistoryActivity extends TabActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.tabs);
 
+        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
+
         getTabHost().setOnTabChangedListener(this);
 
         Bundle extras = getIntent().getExtras();