summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandra Gherghina <alexgherghina@google.com>2014-11-05 10:15:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-05 10:15:02 +0000
commit7ce01fe3529c4095301dc49836953a00f604eeed (patch)
tree55785a8b11cc055d9da1bb8d165c4b485bc08475
parente1c8927961c337e633db994d456e627e296d1210 (diff)
parented321aec3359eca1d3b417e93bd1de1f64c713cb (diff)
downloadpackages_apps_Settings-7ce01fe3529c4095301dc49836953a00f604eeed.zip
packages_apps_Settings-7ce01fe3529c4095301dc49836953a00f604eeed.tar.gz
packages_apps_Settings-7ce01fe3529c4095301dc49836953a00f604eeed.tar.bz2
am ed321aec: am 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
* commit 'ed321aec3359eca1d3b417e93bd1de1f64c713cb': Save missing state in ConfirmAutoSyncChangeFragment
-rw-r--r--src/com/android/settings/accounts/AccountSettings.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 8a183da..1bfa611 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -536,6 +536,7 @@ public class AccountSettings extends SettingsPreferenceFragment
*/
public static class ConfirmAutoSyncChangeFragment extends DialogFragment {
private static final String SAVE_ENABLING = "enabling";
+ private static final String SAVE_USER_HANDLE = "userHandle";
private boolean mEnabling;
private UserHandle mUserHandle;
@@ -554,6 +555,7 @@ public class AccountSettings extends SettingsPreferenceFragment
final Context context = getActivity();
if (savedInstanceState != null) {
mEnabling = savedInstanceState.getBoolean(SAVE_ENABLING);
+ mUserHandle = (UserHandle) savedInstanceState.getParcelable(SAVE_USER_HANDLE);
}
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -581,6 +583,7 @@ public class AccountSettings extends SettingsPreferenceFragment
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(SAVE_ENABLING, mEnabling);
+ outState.putParcelable(SAVE_USER_HANDLE, mUserHandle);
}
}
// TODO Implement a {@link SearchIndexProvider} to allow Indexing and Search of account types