Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move global sync settings to AccountSettings.

Browse Source 
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
This commit is contained in:
Alexandra Gherghina
2014-07-09 09:30:18 +01:00
parent ff795ffba8
commit 64fde6f4e9
9 changed files with 134 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
AndroidManifest.xml
View File

@@ -1485,6 +1485,19 @@
android:resource="@id/battery_settings" />
</activity>
<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.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.AccountSettings" />
</activity>
<activity android:name="Settings$AccountSyncSettingsActivity"
android:label="@string/account_sync_settings_title"
android:taskAffinity=""
@@ -1500,19 +1513,6 @@
android:resource="@id/account_settings" />
</activity>
<activity android:name=".accounts.SyncSettingsActivity"
android:label="@string/account_sync_settings_title">
<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>
<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" />
</activity>
<activity android:name="com.android.settings.accounts.AddAccountSettings"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:configChanges="orientation|keyboardHidden|screenSize"