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

Commit f5f5fb4b authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Revert "Introduce onEvent() to improve testability" 

This reverts commit ef74e737.

Apparently, this CL broke several unit tests.

Change-Id: I86cf5f1ffb0214707afe99ee97f92ba8c5157f3f
parent ef74e737

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

+17 −26
Original line number Diff line number Diff line
@@ -1261,26 +1261,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        mSubtypeState.switchSubtype(token, mRichImm);

    }



    // TODO: Instead of checking for alphabetic keyboard here, separate keycodes for

    // alphabetic shift and shift while in symbol layout and get rid of this method.

    private int getCodePointForKeyboard(final int codePoint) {

        if (Constants.CODE_SHIFT == codePoint) {

            final Keyboard currentKeyboard = mKeyboardSwitcher.getKeyboard();

            if (null != currentKeyboard && currentKeyboard.mId.isAlphabetKeyboard()) {

                return codePoint;

            } else {

                return Constants.CODE_SYMBOL_SHIFT;

            }

        } else {

            return codePoint;

        }

    }



    // Implementation of {@link KeyboardActionListener}.

    @Override

    public void onCodeInput(final int codePoint, final int x, final int y,

            final boolean isKeyRepeat) {

        // TODO: this processing does not belong inside LatinIME, the caller should be doing this.

        final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();

        // x and y include some padding, but everything down the line (especially native

        // code) needs the coordinates in the keyboard frame.
@@ -1289,23 +1273,30 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        // this transformation, it should be done already before calling onCodeInput.

        final int keyX = mainKeyboardView.getKeyX(x);

        final int keyY = mainKeyboardView.getKeyY(y);

        final Event event = createSoftwareKeypressEvent(getCodePointForKeyboard(codePoint),

                keyX, keyY, isKeyRepeat);

        onEvent(event);

        final int codeToSend;

        if (Constants.CODE_SHIFT == codePoint) {

            // TODO: Instead of checking for alphabetic keyboard here, separate keycodes for

            // alphabetic shift and shift while in symbol layout.

            final Keyboard currentKeyboard = mKeyboardSwitcher.getKeyboard();

            if (null != currentKeyboard && currentKeyboard.mId.isAlphabetKeyboard()) {

                codeToSend = codePoint;

            } else {

                codeToSend = Constants.CODE_SYMBOL_SHIFT;

            }



    // This method is public for testability of LatinIME, but also in the future it should

    // completely replace #onCodeInput.

    public void onEvent(final Event event) {

        if (Constants.CODE_SHORTCUT == event.mCodePoint) {

        } else {

            codeToSend = codePoint;

        }

        if (Constants.CODE_SHORTCUT == codePoint) {

            mSubtypeSwitcher.switchToShortcutIME(this);

            // Still call the *#onCodeInput methods for readability.

        }

        final Event event = createSoftwareKeypressEvent(codeToSend, keyX, keyY, isKeyRepeat);

        final InputTransaction completeInputTransaction =

                mInputLogic.onCodeInput(mSettings.getCurrent(), event,

                        mKeyboardSwitcher.getKeyboardShiftMode(),

                        mKeyboardSwitcher.getCurrentKeyboardScriptId(), mHandler);

        updateStateAfterInputTransaction(completeInputTransaction);

        mKeyboardSwitcher.onCodeInput(event.mCodePoint, getCurrentAutoCapsState(),

        mKeyboardSwitcher.onCodeInput(codePoint, getCurrentAutoCapsState(),

                getCurrentRecapitalizeState());

    }

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

+3 −7
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.widget.EditText; 
import android.widget.FrameLayout;



import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;

import com.android.inputmethod.event.Event;

import com.android.inputmethod.keyboard.Key;

import com.android.inputmethod.keyboard.Keyboard;

import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
@@ -264,17 +263,14 @@ public class InputTestsBase extends ServiceTestCase<LatinIMEForTests> { 
        // but keep them in mind if something breaks. Commenting them out as is should work.

        //mLatinIME.onPressKey(codePoint, 0 /* repeatCount */, true /* isSinglePointer */);

        final Key key = mKeyboard.getKey(codePoint);

        final Event event;

        if (key == null) {

            event = Event.createSoftwareKeypressEvent(codePoint, Event.NOT_A_KEY_CODE,

                    Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE, isKeyRepeat);

            mLatinIME.onCodeInput(codePoint, Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE,

                    isKeyRepeat);

        } else {

            final int x = key.getX() + key.getWidth() / 2;

            final int y = key.getY() + key.getHeight() / 2;

            event = Event.createSoftwareKeypressEvent(codePoint, Event.NOT_A_KEY_CODE,

                    x, y, isKeyRepeat);

            mLatinIME.onCodeInput(codePoint, x, y, isKeyRepeat);

        }

        mLatinIME.onEvent(event);

        // Also see the comment at the top of this function about onReleaseKey

        //mLatinIME.onReleaseKey(codePoint, false /* withSliding */);

    }