summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Settings.java
diff options
context:
space:
mode:
authorAlexandra Gherghina <alexgherghina@google.com>2014-07-22 12:04:58 +0000
committerAlexandra Gherghina <alexgherghina@google.com>2014-07-22 20:25:24 +0000
commit6d839875b74f1570e8807005c586298beb677413 (patch)
tree9c9a15d0c5ec4e5990d2d7327be80011ba394970 /src/com/android/settings/Settings.java
parent59ea80b781d8c541076f185cfa81084668521ba5 (diff)
downloadpackages_apps_Settings-6d839875b74f1570e8807005c586298beb677413.zip
packages_apps_Settings-6d839875b74f1570e8807005c586298beb677413.tar.gz
packages_apps_Settings-6d839875b74f1570e8807005c586298beb677413.tar.bz2
Revert "Revert "Move global sync settings to AccountSettings.""
This reverts commit 4869faf46559c54a34b969b5ae5391a208e723af. Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab
Diffstat (limited to 'src/com/android/settings/Settings.java')
-rw-r--r--src/com/android/settings/Settings.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 895e9ea..01149f3 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -69,6 +69,7 @@ public class Settings extends SettingsActivity {
public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }
public static class BatterySaverSettingsActivity extends SettingsActivity { /* empty */ }
public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }
+ public static class AccountSettingsActivity extends SettingsActivity { /* empty */ }
public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }
public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }
public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }