am 3b7aceca: Merge "Make applicationSpecifiedCompletionOn final."

* commit '3b7aceca60462d8d7fb6a8a5a692c2ac5a89940b':
  Make applicationSpecifiedCompletionOn final.

1 files changed, 6 insertions, 4 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 238ebc958..b7dd098e8 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -755,6 +755,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
         // Note: This call should be done by InputMethodService?
         updateFullscreenMode();
         initializeInputAttributes(editorInfo);
+        mApplicationSpecifiedCompletions = null;
 
         inputView.closing();
         mEnteredText = null;
@@ -801,17 +802,17 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
         final boolean insertSpaceOnPickSuggestionManually;
         final boolean inputTypeNoAutoCorrect;
         final boolean isSettingsSuggestionStripOn;
-        boolean applicationSpecifiedCompletionOn = false;
+        final boolean applicationSpecifiedCompletionOn;
 
         if (editorInfo == null || editorInfo.inputType != InputType.TYPE_CLASS_TEXT) {
             if (editorInfo.inputType == InputType.TYPE_NULL) {
                 // TODO: We should honor TYPE_NULL specification.
                 Log.i(TAG, "InputType.TYPE_NULL is specified");
             }
-            mApplicationSpecifiedCompletions = null;
             insertSpaceOnPickSuggestionManually = false;
             isSettingsSuggestionStripOn = false;
             inputTypeNoAutoCorrect = false;
+            applicationSpecifiedCompletionOn = false;
         } else {
             final int inputType = editorInfo.inputType;
             final int inputClass = inputType & InputType.TYPE_MASK_CLASS;
@@ -830,8 +831,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
             final boolean flagAutoComplete =
                     0 != (inputType & InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
 
-            mApplicationSpecifiedCompletions = null;
-
             // Make sure that passwords are not displayed in {@link SuggestionsView}.
             if (InputTypeCompatUtils.isPasswordInputType(inputType)
                     || InputTypeCompatUtils.isVisiblePasswordInputType(inputType)
@@ -865,8 +864,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
             } else {
                 inputTypeNoAutoCorrect = false;
             }
+
             if (flagAutoComplete) {
                 applicationSpecifiedCompletionOn = isFullscreenMode();
+            } else {
+                applicationSpecifiedCompletionOn = false;
             }
         }