am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."

* commit '93c2fa8d3e65ab91898760e64636d5d10942ea17':
  Fix a pernicious bug with caps.
main
Jean Chalard 2013-10-09 17:54:48 -07:00 committed by Android Git Automerger
commit d0b02b526a
2 changed files with 3 additions and 0 deletions

View File

@ -178,6 +178,8 @@ public final class KeyboardState {
if (!state.mIsAlphabetShiftLocked) { if (!state.mIsAlphabetShiftLocked) {
setShifted(state.mShiftMode); setShifted(state.mShiftMode);
} }
// TODO: is this the right place to do this? Should we do this in setShift* instead?
mSwitchActions.requestUpdatingShiftState();
} else { } else {
mPrevMainKeyboardWasShiftLocked = state.mIsAlphabetShiftLocked; mPrevMainKeyboardWasShiftLocked = state.mIsAlphabetShiftLocked;
} }

View File

@ -2929,6 +2929,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
return; return;
} }
tryFixLyingCursorPosition(); tryFixLyingCursorPosition();
mKeyboardSwitcher.updateShiftState();
if (tryResumeSuggestions) mHandler.postResumeSuggestions(); if (tryResumeSuggestions) mHandler.postResumeSuggestions();
} }