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

Commit 2631fe4c authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 6686e63f: Honor automatic shift turned off for gestures 

* commit '6686e63f':
  Honor automatic shift turned off for gestures
parents f2eeb4ae 6686e63f

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

+3 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { 
        }

    }



    public int getManualCapsMode() {

    public int getKeyboardShiftMode() {

        final Keyboard keyboard = getKeyboard();

        if (keyboard == null) {

            return WordComposer.CAPS_MODE_OFF;
@@ -400,6 +400,8 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { 
            return WordComposer.CAPS_MODE_MANUAL_SHIFT_LOCKED;

        case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED:

            return WordComposer.CAPS_MODE_MANUAL_SHIFTED;

        case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED:

            return WordComposer.CAPS_MODE_AUTO_SHIFTED;

        default:

            return WordComposer.CAPS_MODE_OFF;

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -1119,8 +1119,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction 


    // Factor in auto-caps and manual caps and compute the current caps mode.

    private int getActualCapsMode() {

        final int manual = mKeyboardSwitcher.getManualCapsMode();

        if (manual != WordComposer.CAPS_MODE_OFF) return manual;

        final int keyboardShiftMode = mKeyboardSwitcher.getKeyboardShiftMode();

        if (keyboardShiftMode != WordComposer.CAPS_MODE_AUTO_SHIFTED) return keyboardShiftMode;

        final int auto = getCurrentAutoCapsState();

        if (0 != (auto & TextUtils.CAP_MODE_CHARACTERS)) {

            return WordComposer.CAPS_MODE_AUTO_SHIFT_LOCKED;