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

Refactor symbol key state into KeyboardSwitcher 

Change-Id: Idce4e9bf070b08b8a930fd8e800df9c4d8829f8f
main
Tadashi G. Takaoka 2010-11-16 00:28:50 -08:00
parent e3f0ca3848
commit 6c92ee127d
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
View File

@ -75,6 +75,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
private final LatinIME mInputMethodService;
private final LanguageSwitcher mLanguageSwitcher;
private ModifierKeyState mSymbolKeyState = new ModifierKeyState();
private KeyboardId mSymbolsId;
private KeyboardId mSymbolsShiftedId;
@ -382,6 +383,23 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
mInputView.setShiftLocked(shiftLocked);
}
public void onPressSymbol() {
mSymbolKeyState.onPress();
}
public void onReleaseSymbol() {
mSymbolKeyState.onRelease();
}
public boolean isSymbolMomentary() {
return mSymbolKeyState.isMomentary();
}
public void onOtherKeyPressed() {
// TODO: shift key state will be handled too.
mSymbolKeyState.onOtherKeyPressed();
}
public void toggleShift() {
if (isAlphabetMode())
return;

9
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -241,7 +241,6 @@ public class LatinIME extends InputMethodService
// Modifier keys state
private final ModifierKeyState mShiftKeyState = new ModifierKeyState();
private final ModifierKeyState mSymbolKeyState = new ModifierKeyState();
private Tutorial mTutorial;
@ -2323,11 +2322,11 @@ public class LatinIME extends InputMethodService
handleShift();
}
} else if (distinctMultiTouch && primaryCode == BaseKeyboard.KEYCODE_MODE_CHANGE) {
mSymbolKeyState.onPress();
switcher.onPressSymbol();
changeKeyboardMode();
} else {
mShiftKeyState.onOtherKeyPressed();
mSymbolKeyState.onOtherKeyPressed();
switcher.onOtherKeyPressed();
}
}
@ -2352,10 +2351,10 @@ public class LatinIME extends InputMethodService
}
mShiftKeyState.onRelease();
} else if (distinctMultiTouch && primaryCode == BaseKeyboard.KEYCODE_MODE_CHANGE) {
if (mSymbolKeyState.isMomentary()) {
if (switcher.isSymbolMomentary()) {
changeKeyboardMode();
}
mSymbolKeyState.onRelease();
switcher.onReleaseSymbol();
}
}