am 3842c852: am 79c08f57: Merge change 26168 into eclair

[android-x86/packages-apps-Browser.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f6f5a22..3d970ab 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -62,6 +62,7 @@
                 <data android:scheme="http" />
                 <data android:scheme="https" />
                 <data android:scheme="about" />
+                <data android:scheme="javascript" />
             </intent-filter>
             <!--  For these schemes where any of these particular MIME types
                   have been supplied, we are a good candidate. -->
@@ -115,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"