am 71a14420: Merge "Fix obvious bug"

* commit '71a14420d815824605ffc04b47b97386848d31b3':
  Fix obvious bug
main
Tadashi G. Takaoka 2012-02-07 22:44:28 -08:00 committed by Android Git Automerger
commit 5a57a8f52e
1 changed files with 1 additions and 4 deletions

View File

@ -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() {