diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-07-31 00:39:36 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-07-31 00:39:36 -0700 |
| commit | 81fb25aeb7738d3807f54227fe47b97783ab2af6 (patch) | |
| tree | 4378d499402e25c03c359b56464feda37f157470 /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | afa978757343b4467564d059e50eccf26ef69f8a (diff) | |
| parent | 7d654d8cae47f50127021918c24201bb1f0e9a06 (diff) | |
| download | latinime-81fb25aeb7738d3807f54227fe47b97783ab2af6.tar.gz latinime-81fb25aeb7738d3807f54227fe47b97783ab2af6.tar.xz latinime-81fb25aeb7738d3807f54227fe47b97783ab2af6.zip | |
am 7d654d8c: Merge "Fix inconsistency with mutable settings."
* commit '7d654d8cae47f50127021918c24201bb1f0e9a06':
Fix inconsistency with mutable settings.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsValues.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index 3fa00bb2e..a6686d05d 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -37,6 +37,7 @@ import com.android.inputmethod.latin.utils.StringUtils; import java.util.ArrayList; import java.util.Arrays; +import java.util.Locale; /** * When you call the constructor of this class, you may want to change the current system locale by @@ -75,6 +76,7 @@ public final class SettingsValues { public final boolean mGestureFloatingPreviewTextEnabled; public final boolean mSlidingKeyInputPreviewEnabled; public final int mKeyLongpressTimeout; + public final Locale mLocale; // From the input box public final InputAttributes mInputAttributes; @@ -97,8 +99,9 @@ public final class SettingsValues { // Debug settings public final boolean mIsInternal; - public SettingsValues(final SharedPreferences prefs, final Resources res, + public SettingsValues(final SharedPreferences prefs, final Locale locale, final Resources res, final InputAttributes inputAttributes) { + mLocale = locale; // Get the resources mDelayUpdateOldSuggestions = res.getInteger(R.integer.config_delay_update_old_suggestions); mSymbolsPrecededBySpace = |