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

Commit e2af9b7e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Reset vertical correction when more suggestions are in modal mode"

parents c2653d0b 51c38a44

java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.inputmethod.latin.R; 
public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel {

    private final int[] mCoordinates = CoordinateUtils.newInstance();



    private final KeyDetector mKeyDetector;

    protected final KeyDetector mKeyDetector;

    private Controller mController;

    protected KeyboardActionListener mListener;

    private int mOriginX;

java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,12 @@ public final class MoreSuggestionsView extends MoreKeysKeyboardView { 
        updateKeyDrawParams(keyHeight);

    }



    public void adjustVerticalCorrectionForModalMode() {

        // Set vertical correction to zero (Reset more keys keyboard sliding allowance

        // {@link R#dimen.more_keys_keyboard_slide_allowance}).

        mKeyDetector.setKeyboard(getKeyboard(), -getPaddingLeft(), -getPaddingTop());

    }



    @Override

    public void onCodeInput(final int code, final int x, final int y) {

        final int index = code - MoreSuggestions.SUGGESTION_CODE_BASE;

java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java

+2 −2
Original line number Diff line number Diff line
@@ -755,8 +755,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick 


    @Override

    public boolean dispatchTouchEvent(final MotionEvent me) {

        if (!mMoreSuggestionsView.isShowingInParent()

                || mMoreSuggestionsMode == MORE_SUGGESTIONS_IN_MODAL_MODE) {

        if (!mMoreSuggestionsView.isShowingInParent()) {

            mLastX = (int)me.getX();

            mLastY = (int)me.getY();

            if (mMoreSuggestionsSlidingDetector.onTouchEvent(me)) {
@@ -784,6 +783,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick 
            } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP) {

                // Decided to be in the modal input mode

                mMoreSuggestionsMode = MORE_SUGGESTIONS_IN_MODAL_MODE;

                mMoreSuggestionsView.adjustVerticalCorrectionForModalMode();

            }

            return true;

        }