am fdfc8ad2: Merge "Re-evaluate auto-caps earlier."

* commit 'fdfc8ad2d09d3b475df22ba22fca8593a63ae9f5':
  Re-evaluate auto-caps earlier.
main
Jean Chalard 2013-08-14 02:32:46 -07:00 committed by Android Git Automerger
commit 668a441be9
1 changed files with 7 additions and 0 deletions

View File

@ -1861,6 +1861,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
mHandler.postUpdateSuggestionStrip();
if (!mWordComposer.isComposingWord()) {
// If we just removed the last character, auto-caps mode may have changed so we
// need to re-evaluate.
mKeyboardSwitcher.updateShiftState();
}
} else {
final SettingsValues currentSettings = mSettings.getCurrent();
if (mLastComposedWord.canRevertCommit()) {
@ -1948,6 +1953,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (currentSettings.isSuggestionsRequested(mDisplayOrientation)) {
restartSuggestionsOnWordBeforeCursorIfAtEndOfWord();
}
// We just removed a character. We need to update the auto-caps state.
mKeyboardSwitcher.updateShiftState();
}
}