Merge "Make insertSpaceOnPickSuggestionManually final."
This commit is contained in:
commit
4fc0f6ab02
1 changed files with 18 additions and 16 deletions
|
@ -798,28 +798,30 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
private void initializeInputAttributes(final EditorInfo editorInfo) {
|
private void initializeInputAttributes(final EditorInfo editorInfo) {
|
||||||
mInputAttributes = new InputAttributes(editorInfo);
|
mInputAttributes = new InputAttributes(editorInfo);
|
||||||
|
|
||||||
boolean insertSpaceOnPickSuggestionManually = false;
|
final boolean insertSpaceOnPickSuggestionManually;
|
||||||
boolean inputTypeNoAutoCorrect = false;
|
boolean inputTypeNoAutoCorrect = false;
|
||||||
boolean isSettingsSuggestionStripOn = false;
|
boolean isSettingsSuggestionStripOn = false;
|
||||||
boolean applicationSpecifiedCompletionOn = false;
|
boolean applicationSpecifiedCompletionOn = false;
|
||||||
|
|
||||||
if (editorInfo == null)
|
if (editorInfo == null || editorInfo.inputType != InputType.TYPE_CLASS_TEXT) {
|
||||||
return;
|
if (editorInfo.inputType == InputType.TYPE_NULL) {
|
||||||
final int inputType = editorInfo.inputType;
|
|
||||||
if (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;
|
||||||
|
} else {
|
||||||
|
final int inputType = editorInfo.inputType;
|
||||||
final int inputClass = inputType & InputType.TYPE_MASK_CLASS;
|
final int inputClass = inputType & InputType.TYPE_MASK_CLASS;
|
||||||
final int variation = inputType & InputType.TYPE_MASK_VARIATION;
|
final int variation = inputType & InputType.TYPE_MASK_VARIATION;
|
||||||
if (inputClass == 0) {
|
if (inputClass == 0) {
|
||||||
Log.w(TAG, String.format("Unexpected input class: inputType=0x%08x imeOptions=0x%08x",
|
Log.w(TAG, String.format("Unexpected input class: inputType=0x%08x"
|
||||||
|
+ " imeOptions=0x%08x",
|
||||||
inputType, editorInfo.imeOptions));
|
inputType, editorInfo.imeOptions));
|
||||||
}
|
}
|
||||||
|
|
||||||
mApplicationSpecifiedCompletions = null;
|
mApplicationSpecifiedCompletions = null;
|
||||||
|
|
||||||
if (inputClass == InputType.TYPE_CLASS_TEXT) {
|
|
||||||
isSettingsSuggestionStripOn = true;
|
isSettingsSuggestionStripOn = true;
|
||||||
// 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)
|
||||||
|
|
Loading…
Reference in a new issue