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

* commit 'd0b02b526abcb71245c7f6021170e31988b75bab':
  Fix a pernicious bug with caps.
This commit is contained in:
Jean Chalard 2013-10-09 19:32:54 -07:00 committed by Android Git Automerger
commit ff95897fea
2 changed files with 3 additions and 0 deletions

View file

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

View file

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