Add back a SYNC_SETTINGS screen
Revive the old Accounts&Sync screen as a dialog with the auto-sync
checkbox and a list of accounts. This will be launched when Apps
request a SYNC_SETTINGS page for controlling account and master sync.
Auto-sync data checkbox will also continue to exist in Data Usage.
Minor fixes to account list and account update monitoring.
Bug: 6614013
Bug: 6622995
Bug: 6610247
Change-Id: I35c0919a29c6bc7e5edf64f2734a3ef4f5ae5e7a
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 09767bf..cf1f888 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1366,6 +1366,7 @@
<activity android:name="Settings$AccountSyncSettingsActivity"
android:label="@string/account_sync_settings_title"
+ android:parentActivityName="Settings"
android:uiOptions="none">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1378,6 +1379,16 @@
android:resource="@id/account_settings" />
</activity>
+ <activity android:name=".accounts.SyncSettingsActivity"
+ android:label="@string/account_sync_settings_title"
+ android:theme="@android:style/Theme.Holo.Dialog">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.settings.SYNC_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name="com.android.settings.accounts.AddAccountSettings"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -1441,7 +1452,6 @@
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
- <action android:name="android.settings.SYNC_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>