aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-16 10:15:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-16 10:15:47 -0800
commit7f764d882bf2b985913d79bd6bb9a6ba6b13307c (patch)
tree0dcca0f87a44677fbb6462638974335d71d8bc53 /java
parent24e59404997e2b42d78edd264a5c41bf91531f62 (diff)
parent87f87d9ac5479ab30fc71ba45287f28ef1337e1e (diff)
downloadlatinime-7f764d882bf2b985913d79bd6bb9a6ba6b13307c.tar.gz
latinime-7f764d882bf2b985913d79bd6bb9a6ba6b13307c.tar.xz
latinime-7f764d882bf2b985913d79bd6bb9a6ba6b13307c.zip
am 87f87d9a: Merge "[IL59] Rename a method"
* commit '87f87d9ac5479ab30fc71ba45287f28ef1337e1e': [IL59] Rename a method
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java2
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index f99a8b500..3fca4fd19 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -213,7 +213,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
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:
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 73a144d94..fcad0470a 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 @@ public final class InputLogic {
* @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) {