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

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 751d478..90abf0a 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -66,6 +66,7 @@
 import com.android.internal.util.XmlUtils;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.CaptionPropertiesFragment;
+import com.android.settings.accounts.AccountSettings;
 import com.android.settings.accounts.AccountSyncSettings;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.applications.ManageApplications;
@@ -262,6 +263,7 @@
             WifiDisplaySettings.class.getName(),
             PowerUsageSummary.class.getName(),
             AccountSyncSettings.class.getName(),
+            AccountSettings.class.getName(),
             CryptKeeperSettings.class.getName(),
             DataUsageSummary.class.getName(),
             DreamSettings.class.getName(),