diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-11-19 17:21:55 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2010-11-19 17:21:55 -0800 |
| commit | 07f903afbaff989259624f9b757389748929e51a (patch) | |
| tree | bd9d3946a46f226b10e5f54e45420cc8ca961a9d /java/src/com/android/inputmethod/latin/ShiftKeyState.java | |
| parent | 3757d16083aca2bca54297b9517e4d15e3bf98d7 (diff) | |
| parent | 6769c67987f323008647f5d029c02f8cc95272ee (diff) | |
| download | latinime-07f903afbaff989259624f9b757389748929e51a.tar.gz latinime-07f903afbaff989259624f9b757389748929e51a.tar.xz latinime-07f903afbaff989259624f9b757389748929e51a.zip | |
Merge "Fix automatic temporary upper case mode behaviour"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/ShiftKeyState.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/ShiftKeyState.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/ShiftKeyState.java b/java/src/com/android/inputmethod/latin/ShiftKeyState.java index ef13ddc9b..7412a566d 100644 --- a/java/src/com/android/inputmethod/latin/ShiftKeyState.java +++ b/java/src/com/android/inputmethod/latin/ShiftKeyState.java @@ -29,9 +29,9 @@ public class ShiftKeyState extends ModifierKeyState { @Override public void onOtherKeyPressed() { int oldState = mState; - if (mState == PRESSING) { + if (oldState == PRESSING) { mState = MOMENTARY; - } else if (mState == PRESSING_ON_SHIFTED) { + } else if (oldState == PRESSING_ON_SHIFTED) { mState = IGNORING; } if (DEBUG) @@ -58,11 +58,12 @@ public class ShiftKeyState extends ModifierKeyState { return toString(mState); } - protected static String toString(int state) { + @Override + protected String toString(int state) { switch (state) { case PRESSING_ON_SHIFTED: return "PRESSING_ON_SHIFTED"; case IGNORING: return "IGNORING"; - default: return ModifierKeyState.toString(state); + default: return super.toString(state); } } } |