summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-01-19 10:15:47 -0800
committerJohn Reck <jreck@google.com>2011-01-19 16:50:40 -0800
commit267b6af7ee9f731f0da6ae0b27f015308671b835 (patch)
tree435dc754372118da4afc2d65cdd13e6c47c41c50 /AndroidManifest.xml
parent04e1078455bec4643587c1e8c0750d44c33b74ae (diff)
downloadpackages_apps_browser-267b6af7ee9f731f0da6ae0b27f015308671b835.zip
packages_apps_browser-267b6af7ee9f731f0da6ae0b27f015308671b835.tar.gz
packages_apps_browser-267b6af7ee9f731f0da6ae0b27f015308671b835.tar.bz2
Handle chrome sync account deleted case
Bug: 3337527, 3353260 Listens for changes to the system accounts and handles the case of the chrome sync account being deleted. Also, enabling chrome sync in the browser will now enable the browser sync in settings. Change-Id: Iab2ed839fc5fc356a7a4d865965bfafcb39b4ee7
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml18
1 files changed, 7 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1dc53f6..77a27a1 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"
@@ -230,6 +220,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>