aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-12-25 20:08:52 +0900
committerJean Chalard <jchalard@google.com>2013-12-27 16:50:08 +0900
commitc654fe57b1686dde764ea31b0e510885b75b14a1 (patch)
tree55b96a21d565a53af84cf06c5911a05a95f39470 /java/src/com/android/inputmethod/latin/LatinIME.java
parent4a144b9b4d9e78bff7662001c97430491f9747a0 (diff)
downloadlatinime-c654fe57b1686dde764ea31b0e510885b75b14a1.tar.gz
latinime-c654fe57b1686dde764ea31b0e510885b75b14a1.tar.xz
latinime-c654fe57b1686dde764ea31b0e510885b75b14a1.zip
[IL48] Move onEndBatchInputAsyncInternal to InputLogic.
Bug: 8636060 Change-Id: Idfabf7231a80e21786ce1910b5140bb3dddcac7d
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java37
1 files changed, 2 insertions, 35 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 68818b824..901e502a6 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -215,7 +215,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
postUpdateSuggestionStrip();
break;
case MSG_ON_END_BATCH_INPUT:
- latinIme.onEndBatchInputAsyncInternal((SuggestedWords) msg.obj);
+ latinIme.mInputLogic.onEndBatchInputAsyncInternal(latinIme.mSettings.getCurrent(),
+ (SuggestedWords) msg.obj, latinIme.mKeyboardSwitcher);
break;
case MSG_RESET_CACHES:
latinIme.mInputLogic.retryResetCaches(latinIme.mSettings.getCurrent(),
@@ -1428,40 +1429,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
}
- // This method must run on the UI Thread.
- public void onEndBatchInputAsyncInternal(final SuggestedWords suggestedWords) {
- final String batchInputText = suggestedWords.isEmpty() ? null : suggestedWords.getWord(0);
- if (TextUtils.isEmpty(batchInputText)) {
- return;
- }
- mInputLogic.mConnection.beginBatchEdit();
- if (SpaceState.PHANTOM == mInputLogic.mSpaceState) {
- mInputLogic.promotePhantomSpace(mSettings.getCurrent());
- }
- if (mSettings.getCurrent().mPhraseGestureEnabled) {
- // Find the last space
- final int indexOfLastSpace = batchInputText.lastIndexOf(Constants.CODE_SPACE) + 1;
- if (0 != indexOfLastSpace) {
- mInputLogic.mConnection.commitText(batchInputText.substring(0, indexOfLastSpace),
- 1);
- showSuggestionStrip(suggestedWords.getSuggestedWordsForLastWordOfPhraseGesture());
- }
- final String lastWord = batchInputText.substring(indexOfLastSpace);
- mInputLogic.mWordComposer.setBatchInputWord(lastWord);
- mInputLogic.mConnection.setComposingText(lastWord, 1);
- } else {
- mInputLogic.mWordComposer.setBatchInputWord(batchInputText);
- mInputLogic.mConnection.setComposingText(batchInputText, 1);
- }
- mInputLogic.mConnection.endBatchEdit();
- if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
- ResearchLogger.latinIME_onEndBatchInput(batchInputText, 0, suggestedWords);
- }
- // Space state must be updated before calling updateShiftState
- mInputLogic.mSpaceState = SpaceState.PHANTOM;
- mKeyboardSwitcher.updateShiftState();
- }
-
// Called from PointerTracker through the KeyboardActionListener interface
@Override
public void onFinishSlidingInput() {