am f8a056c5: Merge "Reorder members in SettingsValues."

* commit 'f8a056c5c855c29716bde2162010648a43b4fb47':
  Reorder members in SettingsValues.

1 files changed, 17 insertions, 11 deletions

diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index 62cf4a38e..9c956d2a3 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -42,28 +42,34 @@ public class SettingsValues {
     private final String mSymbolsExcludedFromWordSeparators;
     public final CharSequence mHintToSaveText;
 
-    // From preferences:
-    public final boolean mSoundOn; // Sound setting private to Latin IME (see mSilentModeOn)
+    // From preferences, in the same order as xml/prefs.xml:
+    public final boolean mAutoCap;
     public final boolean mVibrateOn;
+    public final boolean mSoundOn;
     public final boolean mKeyPreviewPopupOn;
-    public final int mKeyPreviewPopupDismissDelay;
-    public final boolean mAutoCap;
-    public final boolean mAutoCorrectEnabled;
-    public final double mAutoCorrectionThreshold;
+    private final boolean mShowSettingsKey;
+    // TODO: add a member for the raw "voice_mode" setting
+    // TODO: add a member for the raw "auto_correction_threshold" setting
+    // TODO: add a member for the raw "show_suggestions_setting" setting
+    // TODO: add a member for the raw "usability_study_mode" setting
+    // TODO: add a member for the raw "pref_key_preview_popup_dismiss_delay" setting
+    public final boolean mUseContactsDict;
     // Suggestion: use bigrams to adjust scores of suggestions obtained from unigram dictionary
     public final boolean mBigramSuggestionEnabled;
     // Prediction: use bigrams to predict the next word when there is no input for it yet
     public final boolean mBigramPredictionEnabled;
-    public final boolean mUseContactsDict;
     public final boolean mEnableSuggestionSpanInsertion;
-
-    private final boolean mShowSettingsKey;
-    private final boolean mVoiceKeyEnabled;
-    private final boolean mVoiceKeyOnMain;
+    // TODO: add a member for the raw "pref_vibration_duration_settings" setting
+    // TODO: add a member for the raw "pref_keypress_sound_volume" setting
 
     // Deduced settings
     public final int mKeypressVibrationDuration;
     public final float mFxVolume;
+    public final int mKeyPreviewPopupDismissDelay;
+    public final boolean mAutoCorrectEnabled;
+    public final double mAutoCorrectionThreshold;
+    private final boolean mVoiceKeyEnabled;
+    private final boolean mVoiceKeyOnMain;
 
     public SettingsValues(final SharedPreferences prefs, final Context context,
             final String localeStr) {