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

am c88026e1: Update shift state when alphabet keyboard has been set 

* commit 'c88026e1dfa9dce6d2aee9b9964342a22644dcd1':
  Update shift state when alphabet keyboard has been set
main
Tadashi G. Takaoka 2012-01-15 18:18:12 -08:00 committed by Android Git Automerger
parent 175d3296e8 c88026e1df
commit 2f7952c58e
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -324,6 +324,12 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
setKeyboard(mKeyboardSet.getSymbolsShiftedKeyboard());
}
// Implements {@link KeyboardState.SwitchActions}.
@Override
public void requestUpdatingShiftState() {
mState.onUpdateShiftState(mInputMethodService.getCurrentAutoCapsState());
}
public boolean isInMomentarySwitchState() {
return mState.isInMomentarySwitchState();
}

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

@ -53,6 +53,11 @@ public class KeyboardState {
public void setSymbolsKeyboard();
public void setSymbolsShiftedKeyboard();
/**
* Request to call back {@link KeyboardState#onUpdateShiftState(boolean)}.
*/
public void requestUpdatingShiftState();
}
private KeyboardShiftState mKeyboardShiftState = new KeyboardShiftState();
@ -212,6 +217,7 @@ public class KeyboardState {
mSwitchState = SWITCH_STATE_ALPHA;
setShiftLocked(mPrevMainKeyboardWasShiftLocked);
mPrevMainKeyboardWasShiftLocked = false;
mSwitchActions.requestUpdatingShiftState();
}
private void setSymbolsKeyboard() {

6
tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTests.java
View File

@ -71,6 +71,11 @@ public class KeyboardStateTests extends AndroidTestCase {
mLayout = SYMBOLS_SHIFTED;
}
@Override
public void requestUpdatingShiftState() {
mState.onUpdateShiftState(mAutoCaps);
}
public void toggleCapsLock() {
mState.onToggleCapsLock();
}
@ -111,7 +116,6 @@ public class KeyboardStateTests extends AndroidTestCase {
public void onCancelInput(boolean isSinglePointer) {
mState.onCancelInput(isSinglePointer);
}
}
private MockKeyboardSwitcher mSwitcher;