am cb83b300: Remember shift locked state when switching between Main keyboard and Symbols

* commit 'cb83b300e73700449dec0bd9415d6e1df409c441':
  Remember shift locked state when switching between Main keyboard and Symbols
main
Tadashi G. Takaoka 2011-11-04 10:42:52 +00:00 committed by Android Git Automerger
commit d2a18cbded
1 changed files with 5 additions and 0 deletions

View File

@ -656,11 +656,16 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
return mKeyboardView == null ? 0 : mKeyboardView.getPointerCount(); return mKeyboardView == null ? 0 : mKeyboardView.getPointerCount();
} }
private boolean mPrevMainKeyboardWasShiftLocked;
private void toggleKeyboardMode() { private void toggleKeyboardMode() {
if (mCurrentId.equals(mMainKeyboardId)) { if (mCurrentId.equals(mMainKeyboardId)) {
mPrevMainKeyboardWasShiftLocked = isShiftLocked();
setKeyboard(getKeyboard(mSymbolsKeyboardId)); setKeyboard(getKeyboard(mSymbolsKeyboardId));
} else { } else {
setKeyboard(getKeyboard(mMainKeyboardId)); setKeyboard(getKeyboard(mMainKeyboardId));
setShiftLocked(mPrevMainKeyboardWasShiftLocked);
mPrevMainKeyboardWasShiftLocked = false;
} }
} }