diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:52 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:52 -0800 |
| commit | ed217d91fb3f1a8f4e75ab36ef81d72ef9f4e6d6 (patch) | |
| tree | f4f3c7225a6ed8d870f32cedbbc8f6e41b5633e7 /AndroidManifest.xml | |
| parent | ba6d7b853c32ad6c3be26c443daa61f322bcfdc2 (diff) | |
| download | packages_apps_Browser-ed217d91fb3f1a8f4e75ab36ef81d72ef9f4e6d6.zip packages_apps_Browser-ed217d91fb3f1a8f4e75ab36ef81d72ef9f4e6d6.tar.gz packages_apps_Browser-ed217d91fb3f1a8f4e75ab36ef81d72ef9f4e6d6.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6bf400d..762dc69 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -28,6 +28,22 @@ <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.WAKE_LOCK"/> + <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/> + <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/> + + <!-- Allows an application to read the user Browser's history and bookmarks. --> + <permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" + android:permissionGroup="android.permission-group.PERSONAL_INFO" + android:label="@string/permlab_readHistoryBookmarks" + android:description="@string/permdesc_readHistoryBookmarks" + android:protectionLevel="dangerous" /> + + <!-- Allows an application to write (but not read) the user Browser's history and bookmarks. --> + <permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" + android:permissionGroup="android.permission-group.PERSONAL_INFO" + android:label="@string/permlab_writeHistoryBookmarks" + android:description="@string/permdesc_writeHistoryBookmarks" + android:protectionLevel="dangerous" /> <application android:name="Browser" android:label="Browser" @@ -37,7 +53,11 @@ (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" android:label="Browser" android:launchMode="singleTask" android:alwaysRetainTaskState="true" @@ -91,6 +111,7 @@ </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> <intent-filter> @@ -141,7 +162,13 @@ android:theme="@android:style/Theme.Dialog"> </activity> - <service android:name="GearsDialogService" android:process=":dialog" + <activity android:name="GearsNativeDialog" + android:configChanges="orientation|keyboardHidden" + android:theme="@android:style/Theme.Dialog"> + </activity> + + <service android:name="GearsDialogService" + android:process=":dialog" android:exported="false"> <intent-filter> <action android:name="com.android.browser.IGearsDialogService" /> |