nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 561c4474: Merge "Fix a problem where settings were not renewed correctly." 

* commit '561c4474046a665b5b4b06a2a09d31db92c39aab':
  Fix a problem where settings were not renewed correctly.
main
Jean Chalard 2013-07-31 00:20:42 -07:00 committed by Android Git Automerger
parent 37d17ab210 561c447404
commit 740cb9d29c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -714,7 +714,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
super.onStartInputView(editorInfo, restarting);
final KeyboardSwitcher switcher = mKeyboardSwitcher;
final MainKeyboardView mainKeyboardView = switcher.getMainKeyboardView();
final SettingsValues currentSettingsValues = mSettings.getCurrent();
// If we are starting input in a different text field from before, we'll have to reload
// settings, so currentSettingsValues can't be final.
SettingsValues currentSettingsValues = mSettings.getCurrent();
if (editorInfo == null) {
Log.e(TAG, "Null EditorInfo in onStartInputView()");
@ -808,7 +810,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (isDifferentTextField) {
mainKeyboardView.closing();
loadSettings();
// TODO: Need to update currentSettingsValues after loadSettings()
currentSettingsValues = mSettings.getCurrent();
if (mSuggest != null && currentSettingsValues.mCorrectionEnabled) {
mSuggest.setAutoCorrectionThreshold(currentSettingsValues.mAutoCorrectionThreshold);
}