From 1ba17f97d51ad34e6d8015a22d6bc6afd3eeb321 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 16 Dec 2011 13:52:30 +0900 Subject: [PATCH] Small refactoring This helps to make following changes smaller Change-Id: I95ba2901ac3bf1ed70a748c35a0babdd9af1df63 --- .../com/android/inputmethod/latin/LatinIME.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index abe6dfb96..71db4550c 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -819,6 +819,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar + " imeOptions=0x%08x", inputType, editorInfo.imeOptions)); } + final boolean flagNoSuggestions = + 0 != (inputType & InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS); + final boolean flagMultiLine = + 0 != (inputType & InputType.TYPE_TEXT_FLAG_MULTI_LINE); + final boolean flagAutoCorrect = + 0 != (inputType & InputType.TYPE_TEXT_FLAG_AUTO_CORRECT); + final boolean flagAutoComplete = + 0 != (inputType & InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE); mApplicationSpecifiedCompletions = null; @@ -845,22 +853,21 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } else if (variation == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) { // If it's a browser edit field and auto correct is not ON explicitly, then // disable auto correction, but keep suggestions on. - if ((inputType & InputType.TYPE_TEXT_FLAG_AUTO_CORRECT) == 0) { + if (!flagAutoCorrect) { inputTypeNoAutoCorrect = true; } } // If NO_SUGGESTIONS is set, don't do prediction. - if ((inputType & InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS) != 0) { + if (flagNoSuggestions) { isSettingsSuggestionStripOn = false; inputTypeNoAutoCorrect = true; } // If it's not multiline and the autoCorrect flag is not set, then don't correct - if ((inputType & InputType.TYPE_TEXT_FLAG_AUTO_CORRECT) == 0 - && (inputType & InputType.TYPE_TEXT_FLAG_MULTI_LINE) == 0) { + if (!flagAutoCorrect && !flagMultiLine) { inputTypeNoAutoCorrect = true; } - if ((inputType & InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE) != 0) { + if (flagAutoComplete) { isSettingsSuggestionStripOn = false; applicationSpecifiedCompletionOn = isFullscreenMode(); }