From cdd8a1a69d0fdbf844ab390e22872e2b32f1d664 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 19 Dec 2013 20:31:52 +0900
Subject: [PATCH] [IL13] Inline restartSuggestionsOnWordBeforeCursor
It's only ever used in one place and makes unhealthy assumptions
about what the caller is doing. It's better inlined.
Bug: 8636060
Change-Id: I265d5d96894e929d09247ee2e3dc2e81efc2a276
---
.../latin/inputlogic/InputLogic.java | 32 ++++++-------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index f44ee8b9a8..2f9221071c 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -823,10 +823,17 @@ public final class InputLogic {
final CharSequence word = mConnection.getWordBeforeCursorIfAtEndOfWord(settingsValues);
if (null != word) {
final String wordString = word.toString();
- restartSuggestionsOnWordBeforeCursor(settingsValues, wordString, keyboardSwitcher,
- handler);
+ mWordComposer.setComposingWord(word,
+ // Previous word is the 2nd word before cursor because we are restarting on the
+ // 1st word before cursor.
+ getNthPreviousWordForSuggestion(settingsValues, 2 /* nthPreviousWord */),
+ keyboardSwitcher.getKeyboard());
+ final int length = word.length();
+ mConnection.deleteSurroundingText(length, 0);
+ mConnection.setComposingText(word, 1);
+ handler.postUpdateSuggestionStrip();
// TODO: Handle the case where the user manually moves the cursor and then backs up over
- // a separator. In that case, the current log unit should not be uncommitted.
+ // a separator. In that case, the current log unit should not be uncommitted.
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.getInstance().uncommitCurrentLogUnit(wordString,
true /* dumpCurrentLogUnit */);
@@ -834,25 +841,6 @@ public final class InputLogic {
}
}
- /**
- * Restart suggestions on the word passed as an argument, assuming it is before the cursor.
- * @param settingsValues the current settings values.
- */
- private void restartSuggestionsOnWordBeforeCursor(final SettingsValues settingsValues,
- final String word,
- // TODO: remove these two arguments
- final KeyboardSwitcher keyboardSwitcher, final LatinIME.UIHandler handler) {
- mWordComposer.setComposingWord(word,
- // Previous word is the 2nd word before cursor because we are restarting on the
- // 1st word before cursor.
- getNthPreviousWordForSuggestion(settingsValues, 2 /* nthPreviousWord */),
- keyboardSwitcher.getKeyboard());
- final int length = word.length();
- mConnection.deleteSurroundingText(length, 0);
- mConnection.setComposingText(word, 1);
- handler.postUpdateSuggestionStrip();
- }
-
/**
* Reverts a previous commit with auto-correction.
*
--
GitLab