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

Commit b821b72a authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Remove a member (B5)"

parents b0d61cb9 b0561ae9

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

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
    private int mSpaceState;



    private SettingsValues mCurrentSettings;

    private InputAttributes mInputAttributes;



    private View mExtractArea;

    private View mKeyPreviewBackingView;
@@ -428,10 +427,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        // Note that the calling sequence of onCreate() and onCurrentInputMethodSubtypeChanged()

        // is not guaranteed. It may even be called at the same time on a different thread.

        if (null == mPrefs) mPrefs = PreferenceManager.getDefaultSharedPreferences(this);

        final InputAttributes inputAttributes =

                new InputAttributes(getCurrentInputEditorInfo(), isFullscreenMode());

        final RunInLocale<SettingsValues> job = new RunInLocale<SettingsValues>() {

            @Override

            protected SettingsValues job(Resources res) {

                return new SettingsValues(mPrefs, mInputAttributes, LatinIME.this);

                return new SettingsValues(mPrefs, inputAttributes, LatinIME.this);

            }

        };

        mCurrentSettings = job.runInLocale(mResources, mSubtypeSwitcher.getCurrentSubtypeLocale());
@@ -674,7 +675,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        updateFullscreenMode();

        mLastSelectionStart = editorInfo.initialSelStart;

        mLastSelectionEnd = editorInfo.initialSelEnd;

        mInputAttributes = new InputAttributes(editorInfo, isFullscreenMode());

        mApplicationSpecifiedCompletions = null;



        inputView.closing();

tests/src/com/android/inputmethod/latin/InputTestsBase.java

+1 −1
Original line number Diff line number Diff line
@@ -130,11 +130,11 @@ public class InputTestsBase extends ServiceTestCase<LatinIME> { 
                (LayoutInflater)getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);

        final ViewGroup vg = new FrameLayout(getContext());

        final View inputView = inflater.inflate(R.layout.input_view, vg);

        mLatinIME.onCreateInputMethodInterface().startInput(ic, ei);

        mLatinIME.setInputView(inputView);

        mLatinIME.onBindInput();

        mLatinIME.onCreateInputView();

        mLatinIME.onStartInputView(ei, false);

        mLatinIME.onCreateInputMethodInterface().startInput(ic, ei);

        mInputConnection = ic;

        mKeyboard = mLatinIME.mKeyboardSwitcher.getKeyboard();

        changeLanguage("en_US");