Merge "Fix obvious bug"

main
Tadashi G. Takaoka 2012-02-07 22:42:18 -08:00 committed by Android (Google) Code Review
commit 71a14420d8
1 changed files with 1 additions and 4 deletions

View File

@ -124,20 +124,17 @@ public class KeyboardId {
return mElementId < ELEMENT_SYMBOLS; return mElementId < ELEMENT_SYMBOLS;
} }
// This should be aligned with {@link KeyboardShiftState#isShiftLocked}.
public boolean isAlphabetShiftLockedKeyboard() { public boolean isAlphabetShiftLockedKeyboard() {
return mElementId == ELEMENT_ALPHABET_SHIFT_LOCKED return mElementId == ELEMENT_ALPHABET_SHIFT_LOCKED
|| mElementId == ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED; || mElementId == ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED;
} }
// This should be aligned with {@link KeyboardShiftState#isShiftedOrShiftLocked}.
public boolean isAlphabetShiftedOrShiftLockedKeyboard() { public boolean isAlphabetShiftedOrShiftLockedKeyboard() {
return isAlphabetKeyboard() && mElementId != ELEMENT_ALPHABET; return isAlphabetKeyboard() && mElementId != ELEMENT_ALPHABET;
} }
// This should be aligned with {@link KeyboardShiftState#isManualShifted}.
public boolean isAlphabetManualShiftedKeyboard() { public boolean isAlphabetManualShiftedKeyboard() {
return mElementId != ELEMENT_ALPHABET_MANUAL_SHIFTED; return mElementId == ELEMENT_ALPHABET_MANUAL_SHIFTED;
} }
public boolean isSymbolsKeyboard() { public boolean isSymbolsKeyboard() {