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

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

Merge "Fix a bug where changing auto-shift would cancel autorepeat."

parents 941a4540 5cbda709

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

+2 −2
Original line number Diff line number Diff line
@@ -424,8 +424,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
     */

    @Override

    public void setKeyboard(final Keyboard keyboard) {

        // Remove any pending messages.

        mKeyTimerHandler.cancelAllKeyTimers();

        // Remove any pending messages, except dismissing preview and key repeat.

        mKeyTimerHandler.cancelLongPressTimers();

        super.setKeyboard(keyboard);

        mKeyDetector.setKeyboard(

                keyboard, -getPaddingLeft(), -getPaddingTop() + getVerticalCorrection());

java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public final class TimerHandler extends LeakGuardHandlerWrapper<Callbacks> imple 
        removeMessages(MSG_LONGPRESS_SHIFT_KEY);

    }



    private void cancelLongPressTimers() {

    public void cancelLongPressTimers() {

        removeMessages(MSG_LONGPRESS_KEY);

        removeMessages(MSG_LONGPRESS_SHIFT_KEY);

    }