diff options
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9fdf63bc0..f3707d496 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,25 +1,25 @@ <!-- -/* //device/apps/Browser/AndroidManifest.xml -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ +/* + * Copyright 2006, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.browser"> <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" /> + <uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> @@ -34,6 +34,7 @@ <application android:name="Browser" android:label="@string/application_name" android:icon="@drawable/ic_launcher_browser" + android:backupAgent=".BrowserBackupAgent" android:taskAffinity="android.task.browser" > <provider android:name="BrowserProvider" @@ -120,7 +121,6 @@ <activity android:name="BrowserBookmarksPage" android:label="@string/bookmarks" android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden"> </activity> - <activity android:name="MostVisitedActivity" android:label="" android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden"/> @@ -152,11 +152,20 @@ android:configChanges="orientation|keyboardHidden"> </activity> + <activity android:name="WebsiteSettingsActivity" android:label="" + android:configChanges="orientation|keyboardHidden"> + </activity> + <activity android:name="GearsDialog" android:process=":dialog" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.Dialog"> </activity> + <activity android:name="PermissionDialog" + android:configChanges="orientation|keyboardHidden" + android:theme="@android:style/Theme.Dialog"> + </activity> + <activity android:name="GearsNativeDialog" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.Dialog"> |