From c9cc1b1de5c44d3d0cc587bd91aaa93985b9b000 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 24 Jan 2014 22:14:01 +0900 Subject: [PATCH] [IL102] Rename a method Bug: 8636060 Change-Id: Ia54afdfab9124aa5c35699e357e63eae66a7557f --- java/src/com/android/inputmethod/latin/LatinIME.java | 9 ++++----- .../android/inputmethod/latin/inputlogic/InputLogic.java | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index c6e0fb731..e8ea5e39d 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -195,11 +195,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen (Pair) msg.obj; // [IL]: this is the only place where the second arg is not // suggestedWords.mTypedWord. - latinIme.showSuggestionStripWithTypedWord(p.first, p.second); + latinIme.showSuggestionStrip(p.first, p.second); } else { final SuggestedWords suggestedWords = (SuggestedWords) msg.obj; - latinIme.showSuggestionStripWithTypedWord(suggestedWords, - suggestedWords.mTypedWord); + latinIme.showSuggestionStrip(suggestedWords, suggestedWords.mTypedWord); } } else { latinIme.showGesturePreviewAndSuggestionStrip((SuggestedWords) msg.obj, @@ -1274,7 +1273,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen // This method must run on the UI Thread. private void showGesturePreviewAndSuggestionStrip(final SuggestedWords suggestedWords, final boolean dismissGestureFloatingPreviewText) { - showSuggestionStripWithTypedWord(suggestedWords, suggestedWords.mTypedWord); + showSuggestionStrip(suggestedWords, suggestedWords.mTypedWord); final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView(); mainKeyboardView.showGestureFloatingPreviewText(suggestedWords); if (dismissGestureFloatingPreviewText) { @@ -1410,7 +1409,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen } // TODO[IL]: Define a clean interface for this - public void showSuggestionStripWithTypedWord(final SuggestedWords sourceSuggestedWords, + public void showSuggestionStrip(final SuggestedWords sourceSuggestedWords, final String typedWord) { final SuggestedWords suggestedWords = sourceSuggestedWords.isEmpty() ? SuggestedWords.EMPTY : sourceSuggestedWords; diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index 2978aa852..bbeb74b65 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -1116,7 +1116,7 @@ public final class InputLogic { final SuggestedWords suggestedWords = holder.get(null, Constants.GET_SUGGESTED_WORDS_TIMEOUT); if (suggestedWords != null) { - mLatinIME.showSuggestionStripWithTypedWord(suggestedWords, suggestedWords.mTypedWord); + mLatinIME.showSuggestionStrip(suggestedWords, suggestedWords.mTypedWord); } } @@ -1620,8 +1620,7 @@ public final class InputLogic { mConnection.commitText(batchInputText.substring(0, indexOfLastSpace), 1); final SuggestedWords suggestedWordsForLastWordOfPhraseGesture = suggestedWords.getSuggestedWordsForLastWordOfPhraseGesture(); - mLatinIME.showSuggestionStripWithTypedWord( - suggestedWordsForLastWordOfPhraseGesture, + mLatinIME.showSuggestionStrip(suggestedWordsForLastWordOfPhraseGesture, suggestedWordsForLastWordOfPhraseGesture.mTypedWord); } final String lastWord = batchInputText.substring(indexOfLastSpace);