diff options
| author | John Reck <jreck@google.com> | 2011-01-19 17:34:47 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-19 17:34:47 -0800 |
| commit | 4c1914c2132de46d0664001d23c90fd008a3d2c8 (patch) | |
| tree | 747acad44e03972d0a54c2688557161ebde91a91 /AndroidManifest.xml | |
| parent | 70413a7cc17c2c779b4b673584946ad590f7eb87 (diff) | |
| parent | 267b6af7ee9f731f0da6ae0b27f015308671b835 (diff) | |
| download | packages_apps_Browser-4c1914c2132de46d0664001d23c90fd008a3d2c8.zip packages_apps_Browser-4c1914c2132de46d0664001d23c90fd008a3d2c8.tar.gz packages_apps_Browser-4c1914c2132de46d0664001d23c90fd008a3d2c8.tar.bz2 | |
Merge "Handle chrome sync account deleted case" into honeycomb
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 44d0129..c95ce21 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -33,6 +33,7 @@ <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> + <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/> <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/> @@ -134,9 +135,6 @@ <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" /> </activity> - <activity android:name="BrowserBookmarksPage" android:label="@string/bookmarks" - android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden"> - </activity> <activity android:name="ShortcutActivity" android:theme="@style/ShortcutTheme" @@ -150,17 +148,9 @@ </activity> - <activity android:name="BrowserDownloadPage" android:label="" - android:configChanges="orientation|keyboardHidden"> - </activity> - <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences"> </activity> - <activity android:name="BrowserHistoryPage" android:label="" - android:configChanges="orientation|keyboardHidden"> - </activity> - <activity android:name="BookmarkSearch" android:label="@string/bookmarks_search" android:stateNotNeeded="true" @@ -231,6 +221,12 @@ android:authorities="com.android.browser.home" android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS" android:exported="false" /> + + <receiver android:name=".AccountsChangedReceiver"> + <intent-filter> + <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" /> + </intent-filter> + </receiver> </application> </manifest> |