Accept a null input attributes for reading settings.
Change-Id: I11a8e1aca3541c35d2b39b27716687fcd8ff3dc6
This commit is contained in:
parent
4b9e6ee6fb
commit
01e3b014bb
2 changed files with 1 additions and 3 deletions
|
@ -400,8 +400,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
|
||||||
final Resources res = getResources();
|
final Resources res = getResources();
|
||||||
mResources = res;
|
mResources = res;
|
||||||
|
|
||||||
// TODO: remove the following when it's not needed by updateCorrectionMode() any more
|
|
||||||
mInputAttributes = new InputAttributes(null, false /* isFullscreenMode */);
|
|
||||||
loadSettings();
|
loadSettings();
|
||||||
|
|
||||||
ImfUtils.setAdditionalInputMethodSubtypes(this, mSettingsValues.getAdditionalSubtypes());
|
ImfUtils.setAdditionalInputMethodSubtypes(this, mSettingsValues.getAdditionalSubtypes());
|
||||||
|
|
|
@ -188,7 +188,7 @@ public class SettingsValues {
|
||||||
|
|
||||||
private int createCorrectionMode(final InputAttributes inputAttributes) {
|
private int createCorrectionMode(final InputAttributes inputAttributes) {
|
||||||
final boolean shouldAutoCorrect = mAutoCorrectEnabled
|
final boolean shouldAutoCorrect = mAutoCorrectEnabled
|
||||||
&& !inputAttributes.mInputTypeNoAutoCorrect;
|
&& (null == inputAttributes || !inputAttributes.mInputTypeNoAutoCorrect);
|
||||||
if (mBigramSuggestionEnabled && shouldAutoCorrect) return Suggest.CORRECTION_FULL_BIGRAM;
|
if (mBigramSuggestionEnabled && shouldAutoCorrect) return Suggest.CORRECTION_FULL_BIGRAM;
|
||||||
return shouldAutoCorrect ? Suggest.CORRECTION_FULL : Suggest.CORRECTION_NONE;
|
return shouldAutoCorrect ? Suggest.CORRECTION_FULL : Suggest.CORRECTION_NONE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue