ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 94acc8e4: Merge "Fix the names of the save state contants" into ub-mail-algol 

* commit '94acc8e485dc5fbcd6cf11104a9f2ac9c14f62e5':
  Fix the names of the save state contants
This commit is contained in:
Martin Hibdon 2014-04-07 23:21:16 +00:00 committed by Android Git Automerger
parent 426a953479 94acc8e485
commit e48195bfdc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/email/activity/setup/AccountSettingsFragment.java
View File

@ -105,8 +105,8 @@ public class AccountSettingsFragment extends PreferenceFragment
private static final String PREFERENCE_SYSTEM_FOLDERS_TRASH = "system_folders_trash";
private static final String PREFERENCE_SYSTEM_FOLDERS_SENT = "system_folders_sent";
private static final String EXTRA_SYNC_INTERVALS = "extra_sync_intervals";
private static final String EXTRA_SYNC_INTERVAL_STRINGS = "extra_sync_interval_strings";
private static final String SAVESTATE_SYNC_INTERVALS = "savestate_sync_intervals";
private static final String SAVESTATE_SYNC_INTERVAL_STRINGS = "savestate_sync_interval_strings";
// Request code to start different activities.
private static final int RINGTONE_REQUEST_CODE = 0;
@ -208,9 +208,9 @@ public class AccountSettingsFragment extends PreferenceFragment
// To work around this, we'll save the current set of sync interval values and strings,
// in onSavedInstanceState, and restore them here.
final CharSequence [] syncIntervalStrings =
savedInstanceState.getCharSequenceArray(EXTRA_SYNC_INTERVAL_STRINGS);
savedInstanceState.getCharSequenceArray(SAVESTATE_SYNC_INTERVAL_STRINGS);
final CharSequence [] syncIntervals =
savedInstanceState.getCharSequenceArray(EXTRA_SYNC_INTERVALS);
savedInstanceState.getCharSequenceArray(SAVESTATE_SYNC_INTERVALS);
mCheckFrequency = (ListPreference) findPreference(PREFERENCE_FREQUENCY);
mCheckFrequency.setEntries(syncIntervalStrings);
mCheckFrequency.setEntryValues(syncIntervals);
@ -219,8 +219,8 @@ public class AccountSettingsFragment extends PreferenceFragment
public void onSaveInstanceState(Bundle outstate) {
super.onSaveInstanceState(outstate);
outstate.putCharSequenceArray(EXTRA_SYNC_INTERVAL_STRINGS, mCheckFrequency.getEntries());
outstate.putCharSequenceArray(EXTRA_SYNC_INTERVALS, mCheckFrequency.getEntryValues());
outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVAL_STRINGS, mCheckFrequency.getEntries());
outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVALS, mCheckFrequency.getEntryValues());
}
@Override