nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 9c034480: Merge "[IL102] Rename a method" 

* commit '9c0344801bd05ab56c3cb70bd32e77747a264627':
  [IL102] Rename a method
main
Jean Chalard 2014-01-28 01:45:40 -08:00 committed by Android Git Automerger
parent bb4280669a 9c0344801b
commit 1fe68195bd
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -195,11 +195,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
(Pair<SuggestedWords, String>) msg.obj; (Pair<SuggestedWords, String>) msg.obj;
// [IL]: this is the only place where the second arg is not // [IL]: this is the only place where the second arg is not
// suggestedWords.mTypedWord. // suggestedWords.mTypedWord.
latinIme.showSuggestionStripWithTypedWord(p.first, p.second); latinIme.showSuggestionStrip(p.first, p.second);
} else { } else {
final SuggestedWords suggestedWords = (SuggestedWords) msg.obj; final SuggestedWords suggestedWords = (SuggestedWords) msg.obj;
latinIme.showSuggestionStripWithTypedWord(suggestedWords, latinIme.showSuggestionStrip(suggestedWords, suggestedWords.mTypedWord);
suggestedWords.mTypedWord);
} }
} else { } else {
latinIme.showGesturePreviewAndSuggestionStrip((SuggestedWords) msg.obj, latinIme.showGesturePreviewAndSuggestionStrip((SuggestedWords) msg.obj,
@ -1274,7 +1273,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// This method must run on the UI Thread. // This method must run on the UI Thread.
private void showGesturePreviewAndSuggestionStrip(final SuggestedWords suggestedWords, private void showGesturePreviewAndSuggestionStrip(final SuggestedWords suggestedWords,
final boolean dismissGestureFloatingPreviewText) { final boolean dismissGestureFloatingPreviewText) {
showSuggestionStripWithTypedWord(suggestedWords, suggestedWords.mTypedWord); showSuggestionStrip(suggestedWords, suggestedWords.mTypedWord);
final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView(); final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
mainKeyboardView.showGestureFloatingPreviewText(suggestedWords); mainKeyboardView.showGestureFloatingPreviewText(suggestedWords);
if (dismissGestureFloatingPreviewText) { if (dismissGestureFloatingPreviewText) {
@ -1410,7 +1409,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
// TODO[IL]: Define a clean interface for this // TODO[IL]: Define a clean interface for this
public void showSuggestionStripWithTypedWord(final SuggestedWords sourceSuggestedWords, public void showSuggestionStrip(final SuggestedWords sourceSuggestedWords,
final String typedWord) { final String typedWord) {
final SuggestedWords suggestedWords = final SuggestedWords suggestedWords =
sourceSuggestedWords.isEmpty() ? SuggestedWords.EMPTY : sourceSuggestedWords; sourceSuggestedWords.isEmpty() ? SuggestedWords.EMPTY : sourceSuggestedWords;

5
java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
View File

@ -1116,7 +1116,7 @@ public final class InputLogic {
final SuggestedWords suggestedWords = holder.get(null, final SuggestedWords suggestedWords = holder.get(null,
Constants.GET_SUGGESTED_WORDS_TIMEOUT); Constants.GET_SUGGESTED_WORDS_TIMEOUT);
if (suggestedWords != null) { 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); mConnection.commitText(batchInputText.substring(0, indexOfLastSpace), 1);
final SuggestedWords suggestedWordsForLastWordOfPhraseGesture = final SuggestedWords suggestedWordsForLastWordOfPhraseGesture =
suggestedWords.getSuggestedWordsForLastWordOfPhraseGesture(); suggestedWords.getSuggestedWordsForLastWordOfPhraseGesture();
mLatinIME.showSuggestionStripWithTypedWord( mLatinIME.showSuggestionStrip(suggestedWordsForLastWordOfPhraseGesture,
suggestedWordsForLastWordOfPhraseGesture,
suggestedWordsForLastWordOfPhraseGesture.mTypedWord); suggestedWordsForLastWordOfPhraseGesture.mTypedWord);
} }
final String lastWord = batchInputText.substring(indexOfLastSpace); final String lastWord = batchInputText.substring(indexOfLastSpace);