summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Settings.java
diff options
context:
space:
mode:
authorAlexandra Gherghina <alexgherghina@google.com>2014-07-09 09:30:18 +0100
committerAlexandra Gherghina <alexgherghina@google.com>2014-07-22 12:00:10 +0000
commit64fde6f4e9404a363f577a9fda424affcb5138e4 (patch)
tree50bc82b518574e8168716b3700cc5a26e9e4ebe1 /src/com/android/settings/Settings.java
parentff795ffba80e8a6455f27fab7ad0e8e14e2ec9a4 (diff)
downloadpackages_apps_Settings-64fde6f4e9404a363f577a9fda424affcb5138e4.zip
packages_apps_Settings-64fde6f4e9404a363f577a9fda424affcb5138e4.tar.gz
packages_apps_Settings-64fde6f4e9404a363f577a9fda424affcb5138e4.tar.bz2
Move global sync settings to AccountSettings.
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
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 */ }