commit 87f87d9ac5479ab30fc71ba45287f28ef1337e1e
author Jean Chalard <jchalard@google.com> Thu Jan 16 18:13:39 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 16 18:13:39 2014 +0000
tree 0dcca0f87a44677fbb6462638974335d71d8bc53
parent 9c9c43c0b71e5218b25f16399d2e1677484c62ec
parent 17bd129faf23a8fe2e2172d508cd12add524355b

Merge "[IL59] Rename a method"

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index f99a8b5..3fca4fd 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -213,7 +213,7 @@
                 postUpdateSuggestionStrip();
                 break;
             case MSG_ON_END_BATCH_INPUT:
-                latinIme.mInputLogic.endBatchInputAsyncInternal(latinIme.mSettings.getCurrent(),
+                latinIme.mInputLogic.endBatchInputInternal(latinIme.mSettings.getCurrent(),
                         (SuggestedWords) msg.obj, latinIme.mKeyboardSwitcher);
                 break;
             case MSG_RESET_CACHES:

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 73a144d..fcad047 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -1534,7 +1534,7 @@
      * @param settingsValues the current values of the settings.
      * @param suggestedWords suggestedWords to use.
      */
-    public void endBatchInputAsyncInternal(final SettingsValues settingsValues,
+    public void endBatchInputInternal(final SettingsValues settingsValues,
             final SuggestedWords suggestedWords,
             // TODO: remove this argument
             final KeyboardSwitcher keyboardSwitcher) {