diff options
author | arete <arete@google.com> | 2014-08-15 12:04:48 -0700 |
---|---|---|
committer | Di Wu <arete@google.com> | 2014-08-15 20:49:44 +0000 |
commit | 300e920f66c03b390ce738ccf4d4646ffa039d40 (patch) | |
tree | 439520f6e5a5e7171ff6dd9821496f54f7e5757c /src/com/android/settings/PrivacySettings.java | |
parent | e3bced2cdaf70812f658c45c170e4943ed79dfaf (diff) | |
download | packages_apps_Settings-300e920f66c03b390ce738ccf4d4646ffa039d40.zip packages_apps_Settings-300e920f66c03b390ce738ccf4d4646ffa039d40.tar.gz packages_apps_Settings-300e920f66c03b390ce738ccf4d4646ffa039d40.tar.bz2 |
Keep SwitchPreference status until user makes choice in confirmation dialog.
Bug: 17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41
Diffstat (limited to 'src/com/android/settings/PrivacySettings.java')
-rw-r--r-- | src/com/android/settings/PrivacySettings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index 95a81d1..1236c48 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -113,11 +113,13 @@ public class PrivacySettings extends SettingsPreferenceFragment implements boolean result = false; if (preference == mBackup) { if (nextValue == false) { + // Don't change Switch status until user makes choice in dialog + // so return false here. showEraseBackupDialog(); } else { setBackupEnabled(true); + result = true; } - result = true; } else if (preference == mAutoRestore) { try { mBackupManager.setAutoRestore(nextValue); |