commit 4869faf46559c54a34b969b5ae5391a208e723af
author Alexandra Gherghina <alexgherghina@google.com> Tue Jul 22 12:01:54 2014 +0000
committer Alexandra Gherghina <alexgherghina@google.com> Tue Jul 22 12:01:54 2014 +0000
tree 9f6ce9f2f7d33865be69e451b9b383aa11590e74
parent 64fde6f4e9404a363f577a9fda424affcb5138e4

Revert "Move global sync settings to AccountSettings."

This reverts commit 64fde6f4e9404a363f577a9fda424affcb5138e4.

Change-Id: I61940b6e2936c7c7f048af222602226e5588c268

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a71f84e..a0563b4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1485,19 +1485,6 @@
                 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=""
@@ -1513,6 +1500,19 @@
                 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"