Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37911830 authored by Jean Chalard's avatar Jean Chalard
Browse files

Consolidate updateCorrectionMode() calls 

Change-Id: I43c0505e9a1652bfc568f23b787fc68a5c5e9220
parent aa564e33

java/src/com/android/inputmethod/latin/LatinIME.java

+3 −6
Original line number Diff line number Diff line
@@ -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