nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 25971b5a: Clean up symbol key chording state from KeyboardState 

* commit '25971b5a14b378c4821fadd078e3cdaf8e07bb2a':
  Clean up symbol key chording state from KeyboardState
main
Tadashi G. Takaoka 2012-01-24 01:04:05 -08:00 committed by Android Git Automerger
parent 9921df9079 25971b5a14
commit bab8292f04
3 changed files with 20 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
View File

@ -63,11 +63,8 @@ public class KeyboardState {
private static final int SWITCH_STATE_ALPHA = 0; private static final int SWITCH_STATE_ALPHA = 0;
private static final int SWITCH_STATE_SYMBOL_BEGIN = 1; private static final int SWITCH_STATE_SYMBOL_BEGIN = 1;
private static final int SWITCH_STATE_SYMBOL = 2; private static final int SWITCH_STATE_SYMBOL = 2;
// The following states are used only on the distinct multi-touch panel devices.
private static final int SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL = 3; private static final int SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL = 3;
private static final int SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE = 4; private static final int SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE = 4;
private static final int SWITCH_STATE_CHORDING_ALPHA = 5;
private static final int SWITCH_STATE_CHORDING_SYMBOL = 6;
private int mSwitchState = SWITCH_STATE_ALPHA; private int mSwitchState = SWITCH_STATE_ALPHA;
private String mLayoutSwitchBackSymbols; private String mLayoutSwitchBackSymbols;
@ -313,7 +310,7 @@ public class KeyboardState {
} }
private void onReleaseSymbol(boolean withSliding) { private void onReleaseSymbol(boolean withSliding) {
if (mSwitchState == SWITCH_STATE_CHORDING_ALPHA) { if (mSymbolKeyState.isChording()) {
// Switch back to the previous keyboard mode if the user chords the mode change key and // Switch back to the previous keyboard mode if the user chords the mode change key and
// another key, then releases the mode change key. // another key, then releases the mode change key.
toggleAlphabetAndSymbols(); toggleAlphabetAndSymbols();
@ -330,23 +327,18 @@ public class KeyboardState {
if (DEBUG_EVENT) { if (DEBUG_EVENT) {
Log.d(TAG, "onUpdateShiftState: autoCaps=" + autoCaps + " " + this); Log.d(TAG, "onUpdateShiftState: autoCaps=" + autoCaps + " " + this);
} }
onUpdateShiftStateInternal(autoCaps); updateAlphabetShiftState(autoCaps);
} }
private void onUpdateShiftStateInternal(boolean autoCaps) { private void updateAlphabetShiftState(boolean autoCaps) {
if (mIsAlphabetMode) { if (!mIsAlphabetMode) return;
if (!mAlphabetShiftState.isShiftLocked() && !mShiftKeyState.isIgnoring()) { if (!mAlphabetShiftState.isShiftLocked() && !mShiftKeyState.isIgnoring()) {
if (mShiftKeyState.isReleasing() && autoCaps) { if (mShiftKeyState.isReleasing() && autoCaps) {
// Only when shift key is releasing, automatic temporary upper case will be set. // Only when shift key is releasing, automatic temporary upper case will be set.
setShifted(AUTOMATIC_SHIFT); setShifted(AUTOMATIC_SHIFT);
} else { } else {
setShifted(mShiftKeyState.isMomentary() ? MANUAL_SHIFT : UNSHIFT); setShifted(mShiftKeyState.isChording() ? MANUAL_SHIFT : UNSHIFT);
}
} }
} else {
// In symbol keyboard mode, we should clear shift key state because only alphabet
// keyboard has shift key.
mSymbolKeyState.onRelease();
} }
} }
@ -382,7 +374,7 @@ public class KeyboardState {
private void onReleaseShift(boolean withSliding) { private void onReleaseShift(boolean withSliding) {
if (mIsAlphabetMode) { if (mIsAlphabetMode) {
final boolean isShiftLocked = mAlphabetShiftState.isShiftLocked(); final boolean isShiftLocked = mAlphabetShiftState.isShiftLocked();
if (mShiftKeyState.isMomentary()) { if (mShiftKeyState.isChording()) {
if (mAlphabetShiftState.isShiftLockShifted()) { if (mAlphabetShiftState.isShiftLockShifted()) {
// After chording input while caps lock state. // After chording input while caps lock state.
setShiftLocked(true); setShiftLocked(true);
@ -413,7 +405,7 @@ public class KeyboardState {
} else { } else {
// In symbol mode, switch back to the previous keyboard mode if the user chords the // In symbol mode, switch back to the previous keyboard mode if the user chords the
// shift key and another key, then releases the shift key. // shift key and another key, then releases the shift key.
if (mSwitchState == SWITCH_STATE_CHORDING_SYMBOL) { if (mShiftKeyState.isChording()) {
toggleShiftInSymbols(); toggleShiftInSymbols();
} }
} }
@ -469,12 +461,6 @@ public class KeyboardState {
switch (mSwitchState) { switch (mSwitchState) {
case SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL: case SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL:
// Only distinct multi touch devices can be in this state.
// On non-distinct multi touch devices, mode change key is handled by
// {@link LatinIME#onCodeInput}, not by {@link LatinIME#onPress} and
// {@link LatinIME#onRelease}. So, on such devices, {@link #mSwitchState} starts
// from {@link #SWITCH_STATE_SYMBOL_BEGIN}, or {@link #SWITCH_STATE_ALPHA}, not from
// {@link #SWITCH_STATE_MOMENTARY}.
if (code == Keyboard.CODE_SWITCH_ALPHA_SYMBOL) { if (code == Keyboard.CODE_SWITCH_ALPHA_SYMBOL) {
// Detected only the mode change key has been pressed, and then released. // Detected only the mode change key has been pressed, and then released.
if (mIsAlphabetMode) { if (mIsAlphabetMode) {
@ -488,10 +474,6 @@ public class KeyboardState {
// If the user cancels the sliding input, switching back to the previous keyboard // If the user cancels the sliding input, switching back to the previous keyboard
// mode is handled by {@link #onCancelInput}. // mode is handled by {@link #onCancelInput}.
toggleAlphabetAndSymbols(); toggleAlphabetAndSymbols();
} else {
// Chording input is being started. The keyboard mode will be switched back to the
// previous mode in {@link onReleaseSymbol} when the mode change key is released.
mSwitchState = SWITCH_STATE_CHORDING_ALPHA;
} }
break; break;
case SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE: case SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE:
@ -503,10 +485,6 @@ public class KeyboardState {
// symbol mode and slid to other key, then released the finger. // symbol mode and slid to other key, then released the finger.
toggleShiftInSymbols(); toggleShiftInSymbols();
mSwitchState = SWITCH_STATE_SYMBOL; mSwitchState = SWITCH_STATE_SYMBOL;
} else {
// Chording input is being started. The keyboard mode will be switched back to the
// previous mode in {@link onReleaseShift} when the shift key is released.
mSwitchState = SWITCH_STATE_CHORDING_SYMBOL;
} }
break; break;
case SWITCH_STATE_SYMBOL_BEGIN: case SWITCH_STATE_SYMBOL_BEGIN:
@ -520,7 +498,6 @@ public class KeyboardState {
} }
break; break;
case SWITCH_STATE_SYMBOL: case SWITCH_STATE_SYMBOL:
case SWITCH_STATE_CHORDING_SYMBOL:
// Switch back to alpha keyboard mode if user types one or more non-space/enter // Switch back to alpha keyboard mode if user types one or more non-space/enter
// characters followed by a space/enter or a quote character. // characters followed by a space/enter or a quote character.
if (isSpaceCharacter(code) || isLayoutSwitchBackCharacter(code)) { if (isSpaceCharacter(code) || isLayoutSwitchBackCharacter(code)) {
@ -531,7 +508,7 @@ public class KeyboardState {
// If the code is a letter, update keyboard shift state. // If the code is a letter, update keyboard shift state.
if (Keyboard.isLetterCode(code)) { if (Keyboard.isLetterCode(code)) {
onUpdateShiftStateInternal(autoCaps); updateAlphabetShiftState(autoCaps);
} }
} }
@ -551,8 +528,6 @@ public class KeyboardState {
case SWITCH_STATE_SYMBOL: return "SYMBOL"; case SWITCH_STATE_SYMBOL: return "SYMBOL";
case SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL: return "MOMENTARY-ALPHA-SYMBOL"; case SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL: return "MOMENTARY-ALPHA-SYMBOL";
case SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE: return "MOMENTARY-SYMBOL-MORE"; case SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE: return "MOMENTARY-SYMBOL-MORE";
case SWITCH_STATE_CHORDING_ALPHA: return "CHORDING-ALPHA";
case SWITCH_STATE_CHORDING_SYMBOL: return "CHORDING-SYMBOL";
default: return null; default: return null;
} }
} }

12
java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java
View File

@ -19,12 +19,12 @@ package com.android.inputmethod.keyboard.internal;
import android.util.Log; import android.util.Log;
/* package */ class ModifierKeyState { /* package */ class ModifierKeyState {
protected static final String TAG = "ModifierKeyState"; protected static final String TAG = ModifierKeyState.class.getSimpleName();
protected static final boolean DEBUG = false; protected static final boolean DEBUG = false;
protected static final int RELEASING = 0; protected static final int RELEASING = 0;
protected static final int PRESSING = 1; protected static final int PRESSING = 1;
protected static final int MOMENTARY = 2; protected static final int CHORDING = 2;
protected final String mName; protected final String mName;
protected int mState = RELEASING; protected int mState = RELEASING;
@ -50,7 +50,7 @@ import android.util.Log;
public void onOtherKeyPressed() { public void onOtherKeyPressed() {
final int oldState = mState; final int oldState = mState;
if (oldState == PRESSING) if (oldState == PRESSING)
mState = MOMENTARY; mState = CHORDING;
if (DEBUG) if (DEBUG)
Log.d(TAG, mName + ".onOtherKeyPressed: " + toString(oldState) + " > " + this); Log.d(TAG, mName + ".onOtherKeyPressed: " + toString(oldState) + " > " + this);
} }
@ -63,8 +63,8 @@ import android.util.Log;
return mState == RELEASING; return mState == RELEASING;
} }
public boolean isMomentary() { public boolean isChording() {
return mState == MOMENTARY; return mState == CHORDING;
} }
@Override @Override
@ -76,7 +76,7 @@ import android.util.Log;
switch (state) { switch (state) {
case RELEASING: return "RELEASING"; case RELEASING: return "RELEASING";
case PRESSING: return "PRESSING"; case PRESSING: return "PRESSING";
case MOMENTARY: return "MOMENTARY"; case CHORDING: return "CHORDING";
default: return "UNKNOWN"; default: return "UNKNOWN";
} }
} }

2
java/src/com/android/inputmethod/keyboard/internal/ShiftKeyState.java
View File

@ -30,7 +30,7 @@ import android.util.Log;
public void onOtherKeyPressed() { public void onOtherKeyPressed() {
int oldState = mState; int oldState = mState;
if (oldState == PRESSING) { if (oldState == PRESSING) {
mState = MOMENTARY; mState = CHORDING;
} else if (oldState == PRESSING_ON_SHIFTED) { } else if (oldState == PRESSING_ON_SHIFTED) {
mState = IGNORING; mState = IGNORING;
} }