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

Commit 5a57a8f5 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 71a14420: Merge "Fix obvious bug" 

* commit '71a14420':
  Fix obvious bug
parents 4b801220 71a14420

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

+1 −4
Original line number Diff line number Diff line
@@ -124,20 +124,17 @@ public class KeyboardId { 
        return mElementId < ELEMENT_SYMBOLS;

    }



    // This should be aligned with {@link KeyboardShiftState#isShiftLocked}.

    public boolean isAlphabetShiftLockedKeyboard() {

        return mElementId == ELEMENT_ALPHABET_SHIFT_LOCKED

                || mElementId == ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED;

    }



    // This should be aligned with {@link KeyboardShiftState#isShiftedOrShiftLocked}.

    public boolean isAlphabetShiftedOrShiftLockedKeyboard() {

        return isAlphabetKeyboard() && mElementId != ELEMENT_ALPHABET;

    }



    // This should be aligned with {@link KeyboardShiftState#isManualShifted}.

    public boolean isAlphabetManualShiftedKeyboard() {

        return mElementId != ELEMENT_ALPHABET_MANUAL_SHIFTED;

        return mElementId == ELEMENT_ALPHABET_MANUAL_SHIFTED;

    }



    public boolean isSymbolsKeyboard() {