diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-06-11 14:02:15 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-06-11 14:02:15 -0700 |
| commit | 411a98afb93df99ac3e7546a52cc0a26c7bfe064 (patch) | |
| tree | c7e88095dab279216a190136b5918e3900e7382c /java/src | |
| parent | 642f9df078f1d8b1417bfc5b8ac5040bcf0e7014 (diff) | |
| parent | 379118307661851e781cbc2acdb52de8abd813b3 (diff) | |
| download | latinime-411a98afb93df99ac3e7546a52cc0a26c7bfe064.tar.gz latinime-411a98afb93df99ac3e7546a52cc0a26c7bfe064.tar.xz latinime-411a98afb93df99ac3e7546a52cc0a26c7bfe064.zip | |
Merge "Consolidate updateCorrectionMode() calls"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 1f16f84fa..f2e3098a0 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -402,14 +402,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen final Resources res = getResources(); mResources = res; + // TODO: remove the following when it's not needed by updateCorrectionMode() any more + mInputAttributes = new InputAttributes(null, false /* isFullscreenMode */); loadSettings(); ImfUtils.setAdditionalInputMethodSubtypes(this, mSettingsValues.getAdditionalSubtypes()); - // TODO: remove the following when it's not needed by updateCorrectionMode() any more - mInputAttributes = new InputAttributes(null, false /* isFullscreenMode */); - updateCorrectionMode(); - Utils.GCUtils.getInstance().reset(); boolean tryGC = true; for (int i = 0; i < Utils.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) { @@ -454,6 +452,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen } }; mSettingsValues = job.runInLocale(mResources, mSubtypeSwitcher.getCurrentSubtypeLocale()); + updateCorrectionMode(); mFeedbackManager = new AudioAndHapticFeedbackManager(this, mSettingsValues); resetContactsDictionary(null == mSuggest ? null : mSuggest.getContactsDictionary()); } @@ -700,7 +699,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen mSpaceState = SPACE_STATE_NONE; loadSettings(); - updateCorrectionMode(); updateSuggestionVisibility(mResources); if (mSuggest != null && mSettingsValues.mAutoCorrectEnabled) { @@ -2200,7 +2198,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen mKeyboardSwitcher.loadKeyboard(getCurrentInputEditorInfo(), mSettingsValues); } initSuggest(); - updateCorrectionMode(); loadSettings(); // Since we just changed languages, we should re-evaluate suggestions with whatever word // we are currently composing. If we are not composing anything, we may want to display |