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

Commit bc56e044 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Reset keyboard state when loading keyboard

Bug: 5627467
Change-Id: I709f97e47144d3270450adc7d8053038d0df57bc
parent 55c0198e
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
            mMainKeyboardId = getKeyboardId(editorInfo, false, false, settingsValues);
            mSymbolsKeyboardId = getKeyboardId(editorInfo, true, false, settingsValues);
            mSymbolsShiftedKeyboardId = getKeyboardId(editorInfo, true, true, settingsValues);
            mState.onLoadKeyboard();
            mLayoutSwitchBackSymbols = mResources.getString(R.string.layout_switch_back_symbols);
            setKeyboard(getKeyboard(mSavedKeyboardState.getKeyboardId()));
            mSavedKeyboardState.restore();
+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,13 @@ public class KeyboardState {
    public KeyboardState() {
    }

    public void onLoadKeyboard() {
        mKeyboardShiftState.setShifted(false);
        mKeyboardShiftState.setShiftLocked(false);
        mShiftKeyState.onRelease();
        mSymbolKeyState.onRelease();
    }

    public boolean isShiftLocked() {
        return mKeyboardShiftState.isShiftLocked();
    }