am b2c21033: Merge "Small cleanup"

* commit 'b2c21033ab4c94a718b0bb8725a467d66083c353':
  Small cleanup
main
Tadashi G. Takaoka 2013-08-05 02:49:16 -07:00 committed by Android Git Automerger
commit de7d659ebd
2 changed files with 1 additions and 1 deletions

View File

@ -208,6 +208,7 @@ public final class Constants {
case CODE_ACTION_NEXT: return "actionNext"; case CODE_ACTION_NEXT: return "actionNext";
case CODE_ACTION_PREVIOUS: return "actionPrevious"; case CODE_ACTION_PREVIOUS: return "actionPrevious";
case CODE_LANGUAGE_SWITCH: return "languageSwitch"; case CODE_LANGUAGE_SWITCH: return "languageSwitch";
case CODE_SHIFT_ENTER: return "shiftEnter";
case CODE_UNSPECIFIED: return "unspec"; case CODE_UNSPECIFIED: return "unspec";
case CODE_TAB: return "tab"; case CODE_TAB: return "tab";
case CODE_ENTER: return "enter"; case CODE_ENTER: return "enter";

View File

@ -1639,7 +1639,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
final int wordComposerSize = mWordComposer.size(); final int wordComposerSize = mWordComposer.size();
// Since isComposingWord() is true, the size is at least 1. // Since isComposingWord() is true, the size is at least 1.
final int lastChar = mWordComposer.getCodeBeforeCursor();
if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) { if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
// If we are in the middle of a recorrection, we need to commit the recorrection // If we are in the middle of a recorrection, we need to commit the recorrection
// first so that we can insert the batch input at the current cursor position. // first so that we can insert the batch input at the current cursor position.