Skip to content
Snippets Groups Projects
Commit 71a14420 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Fix obvious bug"

parents bb7a39b4 93bc5e7f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
java/src/com/android/inputmethod/keyboard/KeyboardId.java
+ 1
− 4
View file @ 71a14420
...@@ -124,20 +124,17 @@ public class KeyboardId { ...@@ -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() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment