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

Commit a79431b4 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored... 

am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev

* commit 'd8ba6abf':
  [DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
parents 62bea4d6 d8ba6abf

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

+3 −0
Original line number Diff line number Diff line
@@ -327,6 +327,9 @@ public final class KeyboardState { 
        }

        mIsAlphabetMode = false;

        mIsEmojiMode = true;

        // Remember caps lock mode and reset alphabet shift state.

        mPrevMainKeyboardWasShiftLocked = mAlphabetShiftState.isShiftLocked();

        mAlphabetShiftState.setShiftLocked(false);

        mSwitchActions.setEmojiKeyboard();

    }