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

am d3f1caec: Merge "Add auto caps function simulation to MockKeyboardSwitcher" 

* commit 'd3f1caec0ed2e65fdd489e61c487f61d6f169678':
  Add auto caps function simulation to MockKeyboardSwitcher
main
Tadashi G. Takaoka 2012-01-16 00:15:10 -08:00 committed by Android Git Automerger
parent 06f2692c78 d3f1caec0e
commit 53e3d682d8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
View File

@ -19,6 +19,8 @@ package com.android.inputmethod.keyboard.internal;
import com.android.inputmethod.keyboard.internal.KeyboardState.SwitchActions; import com.android.inputmethod.keyboard.internal.KeyboardState.SwitchActions;
public class MockKeyboardSwitcher implements KeyboardState.SwitchActions { public class MockKeyboardSwitcher implements KeyboardState.SwitchActions {
public static final String WORD_SEPARATORS = " ,.";
private static final int ALPHABET_UNSHIFTED = 0; private static final int ALPHABET_UNSHIFTED = 0;
private static final int ALPHABET_MANUAL_SHIFTED = 1; private static final int ALPHABET_MANUAL_SHIFTED = 1;
private static final int ALPHABET_AUTOMATIC_SHIFTED = 2; private static final int ALPHABET_AUTOMATIC_SHIFTED = 2;
@ -28,8 +30,9 @@ public class MockKeyboardSwitcher implements KeyboardState.SwitchActions {
private int mLayout = ALPHABET_UNSHIFTED; private int mLayout = ALPHABET_UNSHIFTED;
// TODO: Separate Auto Caps mode and Auto Caps state of input. private boolean mAutoCapsMode = KeyboardStateTests.NO_AUTO_CAPS;
private boolean mAutoCaps = KeyboardStateTests.NO_AUTO_CAPS; // Following InputConnection's behavior. Simulating InputType.TYPE_TEXT_FLAG_CAP_WORDS.
private boolean mAutoCapsState = true;
private final KeyboardState mState = new KeyboardState(this); private final KeyboardState mState = new KeyboardState(this);
@ -58,7 +61,7 @@ public class MockKeyboardSwitcher implements KeyboardState.SwitchActions {
} }
public void setAutoCapsMode(boolean autoCaps) { public void setAutoCapsMode(boolean autoCaps) {
mAutoCaps = autoCaps; mAutoCapsMode = autoCaps;
} }
@Override @Override
@ -98,7 +101,7 @@ public class MockKeyboardSwitcher implements KeyboardState.SwitchActions {
@Override @Override
public void requestUpdatingShiftState() { public void requestUpdatingShiftState() {
mState.onUpdateShiftState(mAutoCaps); mState.onUpdateShiftState(mAutoCapsMode && mAutoCapsState);
} }
public void toggleCapsLock() { public void toggleCapsLock() {
@ -106,7 +109,7 @@ public class MockKeyboardSwitcher implements KeyboardState.SwitchActions {
} }
public void updateShiftState() { public void updateShiftState() {
mState.onUpdateShiftState(mAutoCaps); mState.onUpdateShiftState(mAutoCapsMode && mAutoCapsState);
} }
public void loadKeyboard(String layoutSwitchBackSymbols, public void loadKeyboard(String layoutSwitchBackSymbols,
@ -135,7 +138,8 @@ public class MockKeyboardSwitcher implements KeyboardState.SwitchActions {
} }
public void onCodeInput(int code, boolean isSinglePointer) { public void onCodeInput(int code, boolean isSinglePointer) {
mState.onCodeInput(code, isSinglePointer, mAutoCaps); mAutoCapsState = (WORD_SEPARATORS.indexOf(code) >= 0);
mState.onCodeInput(code, isSinglePointer, mAutoCapsMode && mAutoCapsState);
} }
public void onCancelInput(boolean isSinglePointer) { public void onCancelInput(boolean isSinglePointer) {