aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-27 03:22:01 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-27 03:22:01 -0800
commit925f8fcf8858fee5cff2f59078e0b975e8f2f024 (patch)
tree86b0374749e70b5b840fd20af88d682caef5e39e /java/src/com/android
parent38f4272ade8a02fd4ba328cc9934accc89f0216a (diff)
parent8f3e37a63187f4fb2731f629472037a373796097 (diff)
downloadlatinime-925f8fcf8858fee5cff2f59078e0b975e8f2f024.tar.gz
latinime-925f8fcf8858fee5cff2f59078e0b975e8f2f024.tar.xz
latinime-925f8fcf8858fee5cff2f59078e0b975e8f2f024.zip
am 8f3e37a6: Merge "[IL87] Remove a call to clearSuggestionStrip"
* commit '8f3e37a63187f4fb2731f629472037a373796097': [IL87] Remove a call to clearSuggestionStrip
Diffstat (limited to 'java/src/com/android')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 0382b3405..4520283c0 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1457,12 +1457,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// TODO[IL]: Define a clean interface for this
public void showSuggestionStrip(final SuggestedWords suggestedWords) {
- if (suggestedWords.isEmpty()) {
- clearSuggestionStrip();
- return;
- }
- showSuggestionStripWithTypedWord(suggestedWords,
- suggestedWords.getWord(SuggestedWords.INDEX_OF_TYPED_WORD));
+ showSuggestionStripWithTypedWord(suggestedWords, suggestedWords.isEmpty() ? null
+ : suggestedWords.getWord(SuggestedWords.INDEX_OF_TYPED_WORD));
}
// Called from {@link SuggestionStripView} through the {@link SuggestionStripView#Listener}