summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorSatish Sampath <satish@android.com>2009-05-29 15:37:27 +0100
committerSatish Sampath <satish@android.com>2009-06-03 17:08:31 +0100
commit565505b1a2c1d3099496af5910760087602e994a (patch)
tree45051646b0114ed243bec49b46a4379c332f69cd /AndroidManifest.xml
parent8dd422a6b60f82a950900fb12d3ba987edac3e86 (diff)
downloadpackages_apps_browser-565505b1a2c1d3099496af5910760087602e994a.zip
packages_apps_browser-565505b1a2c1d3099496af5910760087602e994a.tar.gz
packages_apps_browser-565505b1a2c1d3099496af5910760087602e994a.tar.bz2
Use system default web search & suggestions providers.
- Web search was hard coded to Google and suggestions in the search dialog were hard coded to the GoogleSearch suggest provider package. Both now point to the system default web search/suggest provider which can include third party search engines. - I also removed the intent filter to handle action.WEB_SEARCH from the browser because it should no longer provide web search functionality for other apps, that feature is provided by the recently added WebSearchProvider package. Removing this intent filter also removes the browser from the list of web search providers in the system settings. - As part of this change I had to factor out the search shortcut code to a separate function, add a couple of new functions and modify the browser provider code to access cursor fields in a safe manner.
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml9
1 files changed, 4 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a3cd743..e9aff63 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -53,9 +53,9 @@
(android.test) library. -->
<uses-library android:name="android.test.runner" />
- <provider android:name="BrowserProvider"
- android:authorities="browser"
- android:multiprocess="true"
+ <provider android:name="BrowserProvider"
+ android:authorities="browser"
+ android:multiprocess="true"
android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
android:writePermission="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
<activity android:name="BrowserActivity"
@@ -112,7 +112,6 @@
<data android:scheme="https" />
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.WEB_SEARCH" />
<action android:name="android.intent.action.MEDIA_SEARCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@@ -149,7 +148,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- </activity-alias>
+ </activity-alias>
<activity android:name="BrowserDownloadPage" android:label=""
android:configChanges="orientation|keyboardHidden">