From 81e0ca5fd395fd67c7b93e7d87e7d90fa136f065 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Wed, 25 Dec 2013 21:03:24 +0900 Subject: [IL49] Move InputLogic-related init code to InputLogic. Bug: 8636060 Change-Id: Ie5027512f066d9c530a686ac559e4649a39bf439 --- .../inputmethod/latin/inputlogic/InputLogic.java | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java') diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index 34377e955..5fe482bda 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -116,9 +116,22 @@ public final class InputLogic { * some things must not be done (for example, the keyboard should not be reset to the * alphabetic layout), so do not send false to this just in case. * - * @param restarting whether input is starting in the same field as before. + * @param restarting whether input is starting in the same field as before. Unused for now. + * @param editorInfo the editorInfo associated with the editor. */ - public void startInput(final boolean restarting) { + public void startInput(final boolean restarting, final EditorInfo editorInfo) { + mEnteredText = null; + resetComposingState(true /* alsoResetLastComposedWord */); + mDeleteCount = 0; + mSpaceState = SpaceState.NONE; + mRecapitalizeStatus.deactivate(); + mCurrentlyPressedHardwareKeys.clear(); + mSuggestedWords = SuggestedWords.EMPTY; + mLastSelectionStart = editorInfo.initialSelStart; + mLastSelectionEnd = editorInfo.initialSelEnd; + // In some cases (namely, after rotation of the device) editorInfo.initialSelStart is lying + // so we try using some heuristics to find out about these and fix them. + tryFixLyingCursorPosition(); mInputLogicHandler = new InputLogicHandler(); } @@ -126,6 +139,10 @@ public final class InputLogic { * Clean up the input logic after input is finished. */ public void finishInput() { + if (mWordComposer.isComposingWord()) { + mConnection.finishComposingText(); + } + resetComposingState(true /* alsoResetLastComposedWord */); mInputLogicHandler.destroy(); mInputLogicHandler = null; } -- cgit v1.2.3-83-g751a