am b3a049f5: Merge "Save the auto-sync dialog state for orientation changes" into jb-dev

* commit 'b3a049f5392da8500befaf2595f5170cf04cc432':
  Save the auto-sync dialog state for orientation changes
This commit is contained in:
Amith Yamasani
2012-06-08 00:05:25 -07:00
committed by Android Git Automerger

View File

@@ -2035,6 +2035,7 @@ public class DataUsageSummary extends Fragment {
* Dialog to inform user about changing auto-sync setting * Dialog to inform user about changing auto-sync setting
*/ */
public static class ConfirmAutoSyncChangeFragment extends DialogFragment { public static class ConfirmAutoSyncChangeFragment extends DialogFragment {
private static final String SAVE_ENABLING = "enabling";
private boolean mEnabling; private boolean mEnabling;
public static void show(DataUsageSummary parent, boolean enabling) { public static void show(DataUsageSummary parent, boolean enabling) {
@@ -2049,6 +2050,9 @@ public class DataUsageSummary extends Fragment {
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
final Context context = getActivity(); final Context context = getActivity();
if (savedInstanceState != null) {
mEnabling = savedInstanceState.getBoolean(SAVE_ENABLING);
}
final AlertDialog.Builder builder = new AlertDialog.Builder(context); final AlertDialog.Builder builder = new AlertDialog.Builder(context);
if (!mEnabling) { if (!mEnabling) {
@@ -2069,6 +2073,12 @@ public class DataUsageSummary extends Fragment {
return builder.create(); return builder.create();
} }
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(SAVE_ENABLING, mEnabling);
}
} }
/** /**