commit 6d839875b74f1570e8807005c586298beb677413
author Alexandra Gherghina <alexgherghina@google.com> Tue Jul 22 12:04:58 2014 +0000
committer Alexandra Gherghina <alexgherghina@google.com> Tue Jul 22 20:25:24 2014 +0000
tree 9c9a15d0c5ec4e5990d2d7327be80011ba394970
parent 59ea80b781d8c541076f185cfa81084668521ba5

Revert "Revert "Move global sync settings to AccountSettings.""

This reverts commit 4869faf46559c54a34b969b5ae5391a208e723af.

Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a0563b4..a71f84e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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"