Make inputTypeAutoCorrect final.
Change-Id: I550eba1fc3fa2843d007a8208d81fad208c1196b
This commit is contained in:
parent
13db05f930
commit
9cc1312eee
1 changed files with 9 additions and 12 deletions
|
@ -799,7 +799,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
mInputAttributes = new InputAttributes(editorInfo);
|
mInputAttributes = new InputAttributes(editorInfo);
|
||||||
|
|
||||||
final boolean insertSpaceOnPickSuggestionManually;
|
final boolean insertSpaceOnPickSuggestionManually;
|
||||||
boolean inputTypeNoAutoCorrect = false;
|
final boolean inputTypeNoAutoCorrect;
|
||||||
final boolean isSettingsSuggestionStripOn;
|
final boolean isSettingsSuggestionStripOn;
|
||||||
boolean applicationSpecifiedCompletionOn = false;
|
boolean applicationSpecifiedCompletionOn = false;
|
||||||
|
|
||||||
|
@ -811,6 +811,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
mApplicationSpecifiedCompletions = null;
|
mApplicationSpecifiedCompletions = null;
|
||||||
insertSpaceOnPickSuggestionManually = false;
|
insertSpaceOnPickSuggestionManually = false;
|
||||||
isSettingsSuggestionStripOn = false;
|
isSettingsSuggestionStripOn = false;
|
||||||
|
inputTypeNoAutoCorrect = 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;
|
||||||
|
@ -852,21 +853,17 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
} else {
|
} else {
|
||||||
insertSpaceOnPickSuggestionManually = true;
|
insertSpaceOnPickSuggestionManually = true;
|
||||||
}
|
}
|
||||||
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 (!flagAutoCorrect) {
|
|
||||||
inputTypeNoAutoCorrect = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// If it's a browser edit field and auto correct is not ON explicitly, then
|
||||||
|
// disable auto correction, but keep suggestions on.
|
||||||
// If NO_SUGGESTIONS is set, don't do prediction.
|
// If NO_SUGGESTIONS is set, don't do prediction.
|
||||||
if (flagNoSuggestions) {
|
|
||||||
inputTypeNoAutoCorrect = true;
|
|
||||||
}
|
|
||||||
// If it's not multiline and the autoCorrect flag is not set, then don't correct
|
// If it's not multiline and the autoCorrect flag is not set, then don't correct
|
||||||
if (!flagAutoCorrect && !flagMultiLine) {
|
if ((variation == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT && !flagAutoCorrect)
|
||||||
|
|| flagNoSuggestions
|
||||||
|
|| (!flagAutoCorrect && !flagMultiLine)) {
|
||||||
inputTypeNoAutoCorrect = true;
|
inputTypeNoAutoCorrect = true;
|
||||||
|
} else {
|
||||||
|
inputTypeNoAutoCorrect = false;
|
||||||
}
|
}
|
||||||
if (flagAutoComplete) {
|
if (flagAutoComplete) {
|
||||||
applicationSpecifiedCompletionOn = isFullscreenMode();
|
applicationSpecifiedCompletionOn = isFullscreenMode();
|
||||||
|
|
Loading…
Reference in a new issue