nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3b7aceca: Merge "Make applicationSpecifiedCompletionOn final." 

* commit '3b7aceca60462d8d7fb6a8a5a692c2ac5a89940b':
  Make applicationSpecifiedCompletionOn final.
main
Jean Chalard 2011-12-16 03:23:50 -08:00 committed by Android Git Automerger
parent cfe7fbd3cf 3b7aceca60
commit 0f4289c83b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/latin/LatinIME.java
View File

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