From 267b6af7ee9f731f0da6ae0b27f015308671b835 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 19 Jan 2011 10:15:47 -0800
Subject: 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
---
 AndroidManifest.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'AndroidManifest.xml')

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>
-- 
cgit v1.1