aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2014-05-23 14:34:06 +0000
committerKen Wakasa <kwakasa@google.com>2014-05-23 14:34:06 +0000
commitd941ea182629390dfda41d59bb0e9a2bedb0dd28 (patch)
treebe1cb07de81d88f6cb4e59a416816d19160cff0c /java/src/com/android
parent7aa895e2e3edb59620c28354c7d7746b93964b10 (diff)
downloadlatinime-d941ea182629390dfda41d59bb0e9a2bedb0dd28.tar.gz
latinime-d941ea182629390dfda41d59bb0e9a2bedb0dd28.tar.xz
latinime-d941ea182629390dfda41d59bb0e9a2bedb0dd28.zip
Revert "Fix: too many calls to getSuggestedWordsForTypingInput"
This reverts commit 7aa895e2e3edb59620c28354c7d7746b93964b10. Bug: 15148015 Change-Id: If39c4f8b897f247d4eb935923d55d81def4c8fb4
Diffstat (limited to 'java/src/com/android')
-rw-r--r--java/src/com/android/inputmethod/latin/Suggest.java1
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java9
2 files changed, 4 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 154872778..e3759a586 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -18,6 +18,7 @@ package com.android.inputmethod.latin;
import android.text.TextUtils;
+import com.android.inputmethod.event.Event;
import com.android.inputmethod.keyboard.ProximityInfo;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
import com.android.inputmethod.latin.define.ProductionFlag;
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 2dcfa4b6a..ea58abc14 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -802,11 +802,10 @@ public final class InputLogic {
final int codePoint = inputTransaction.mEvent.mCodePoint;
final SettingsValues settingsValues = inputTransaction.mSettingsValues;
boolean didAutoCorrect = false;
- final boolean wasComposingWord = mWordComposer.isComposingWord();
// We avoid sending spaces in languages without spaces if we were composing.
final boolean shouldAvoidSendingCode = Constants.CODE_SPACE == codePoint
&& !settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
- && wasComposingWord;
+ && mWordComposer.isComposingWord();
if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
// If we are in the middle of a recorrection, we need to commit the recorrection
// first so that we can insert the separator at the current cursor position.
@@ -850,7 +849,7 @@ public final class InputLogic {
promotePhantomSpace(settingsValues);
}
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
- ResearchLogger.latinIME_handleSeparator(codePoint, wasComposingWord);
+ ResearchLogger.latinIME_handleSeparator(codePoint, mWordComposer.isComposingWord());
}
if (!shouldAvoidSendingCode) {
@@ -866,9 +865,7 @@ public final class InputLogic {
}
startDoubleSpacePeriodCountdown(inputTransaction);
- if (wasComposingWord) {
- inputTransaction.setRequiresUpdateSuggestions();
- }
+ inputTransaction.setRequiresUpdateSuggestions();
} else {
if (swapWeakSpace) {
swapSwapperAndSpace(inputTransaction);