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

Merge "Fix saving keyboard state while rotating"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2011-08-03 15:15:59 -07:00 committed by Android (Google) Code Review
commit bb12dc455b
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View file

@ -188,8 +188,13 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
public void save() { public void save() {
mIsAlphabetMode = isAlphabetMode(); mIsAlphabetMode = isAlphabetMode();
mIsShiftLocked = mIsAlphabetMode && isShiftLocked(); if (mIsAlphabetMode) {
mIsShifted = !mIsShiftLocked && isShiftedOrShiftLocked(); mIsShiftLocked = isShiftLocked();
mIsShifted = !mIsShiftLocked && isShiftedOrShiftLocked();
} else {
mIsShiftLocked = false;
mIsShifted = mSymbolsShiftedKeyboardId.equals(mCurrentId);
}
mIsValid = true; mIsValid = true;
} }

2
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -115,7 +115,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
private static final int SCREEN_ORIENTATION_CHANGE_DETECTION_DELAY = 2; private static final int SCREEN_ORIENTATION_CHANGE_DETECTION_DELAY = 2;
private static final int ACCUMULATE_START_INPUT_VIEW_DELAY = 20; private static final int ACCUMULATE_START_INPUT_VIEW_DELAY = 20;
private static final int RESTORE_KEYBOARD_STATE_DELAY = 200; private static final int RESTORE_KEYBOARD_STATE_DELAY = 300;
/** /**
* The name of the scheme used by the Package Manager to warn of a new package installation, * The name of the scheme used by the Package Manager to warn of a new package installation,