commit 1e8fac5e83a0aa381c9bb28077f34a0f0f626237
author Ben Murdoch <benm@google.com> Mon Sep 21 15:34:07 2009 +0100
committer Ben Murdoch <benm@google.com> Mon Sep 21 15:34:07 2009 +0100
tree c5c3e44737fbaeee6abcf7714fa9d560d805075a
parent 5942df0c38dff7e4335e352e2d03f100b07b8907

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

AndroidManifest.xml

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"

src/com/android/browser/CombinedBookmarkHistoryActivity.java

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 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.tabs);
 
+        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
+
         getTabHost().setOnTabChangedListener(this);
 
         Bundle extras = getIntent().getExtras();