diff options
| author | Alexandra Gherghina <alexgherghina@google.com> | 2014-07-09 09:30:18 +0100 |
|---|---|---|
| committer | Alexandra Gherghina <alexgherghina@google.com> | 2014-07-22 12:00:10 +0000 |
| commit | 64fde6f4e9404a363f577a9fda424affcb5138e4 (patch) | |
| tree | 50bc82b518574e8168716b3700cc5a26e9e4ebe1 /AndroidManifest.xml | |
| parent | ff795ffba80e8a6455f27fab7ad0e8e14e2ec9a4 (diff) | |
| download | packages_apps_Settings-64fde6f4e9404a363f577a9fda424affcb5138e4.zip packages_apps_Settings-64fde6f4e9404a363f577a9fda424affcb5138e4.tar.gz packages_apps_Settings-64fde6f4e9404a363f577a9fda424affcb5138e4.tar.bz2 | |
Move global sync settings to AccountSettings.
It also makes AccountSettings respond to the SYNC_SETTINGS intent, which
it is currently triggered by Calendar and could be triggered by Gmail.
Bug: 16076571
Change-Id: I2c55262a87e46ba88f36a90a2f8f27d08f88e851
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a0563b4..a71f84e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1485,32 +1485,32 @@ android:resource="@id/battery_settings" /> </activity> - <activity android:name="Settings$AccountSyncSettingsActivity" - android:label="@string/account_sync_settings_title" + <activity android:name="Settings$AccountSettingsActivity" + android:label="@string/account_settings_title" android:taskAffinity="" android:parentActivityName="Settings"> <intent-filter> <action android:name="android.intent.action.MAIN" /> - <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" /> + <action android:name="android.settings.SYNC_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.accounts.AccountSyncSettings" /> - <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" - android:resource="@id/account_settings" /> + android:value="com.android.settings.accounts.AccountSettings" /> </activity> - <activity android:name=".accounts.SyncSettingsActivity" - android:label="@string/account_sync_settings_title"> + <activity android:name="Settings$AccountSyncSettingsActivity" + android:label="@string/account_sync_settings_title" + android:taskAffinity="" + android:parentActivityName="Settings"> <intent-filter> <action android:name="android.intent.action.MAIN" /> - <action android:name="android.settings.SYNC_SETTINGS" /> + <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.accounts.AccountSyncSettings" /> + android:value="com.android.settings.accounts.AccountSyncSettings" /> <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" - android:resource="@id/account_settings" /> + android:resource="@id/account_settings" /> </activity> <activity android:name="com.android.settings.accounts.AddAccountSettings" |