From 6769c67987f323008647f5d029c02f8cc95272ee Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 19 Nov 2010 13:52:58 -0800 Subject: Fix automatic temporary upper case mode behaviour This change is a followup of I948ef26f Automatic Temporary Upper Case mode acts like Normal mode until shift key is pressed. However, after shift key is pressed, it acts like Manual Temporary Upper Case mode. Bug: 3193390 Change-Id: Id3d7a38a1f5905322cd46ded36b1db26576d49af --- java/src/com/android/inputmethod/latin/ShiftKeyState.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/ShiftKeyState.java') 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); } } } -- cgit v1.2.3-83-g751a