diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-06-06 20:23:08 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-06-06 20:55:40 -0700 |
| commit | 86708a8a6da3d2da4547750ce67a89744a2878a1 (patch) | |
| tree | 119df8c219af6692a73b134717cb4bd32cb4dc0f /AndroidManifest.xml | |
| parent | 6a5e0252ce383654e304ffd0bca09ced0cadc0a3 (diff) | |
| download | packages_apps_settings-86708a8a6da3d2da4547750ce67a89744a2878a1.zip packages_apps_settings-86708a8a6da3d2da4547750ce67a89744a2878a1.tar.gz packages_apps_settings-86708a8a6da3d2da4547750ce67a89744a2878a1.tar.bz2 | |
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
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 12 |
1 files changed, 11 insertions, 1 deletions
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> |