fixed inconsistencies with setting the punctuation order (there should be no functional changes)
This commit is contained in:
parent
29be10ea68
commit
b08431ef1b
2 changed files with 18 additions and 11 deletions
|
|
@ -48,24 +48,16 @@ class ModeCheonjiin extends InputMode {
|
||||||
|
|
||||||
SPECIAL_CHAR_SEQUENCE_PREFIX = "11";
|
SPECIAL_CHAR_SEQUENCE_PREFIX = "11";
|
||||||
|
|
||||||
super.setLanguage(LanguageCollection.getLanguage(LanguageKind.KOREAN));
|
|
||||||
|
|
||||||
autoSpace = new AutoSpace(settings).setLanguage(language);
|
autoSpace = new AutoSpace(settings);
|
||||||
digitSequence = "";
|
digitSequence = "";
|
||||||
allowedTextCases.add(CASE_LOWER);
|
allowedTextCases.add(CASE_LOWER);
|
||||||
this.inputType = inputType;
|
this.inputType = inputType;
|
||||||
this.textField = textField;
|
this.textField = textField;
|
||||||
|
|
||||||
|
setLanguage(LanguageCollection.getLanguage(LanguageKind.KOREAN));
|
||||||
initPredictions();
|
initPredictions();
|
||||||
setSpecialCharacterConstants();
|
setSpecialCharacterConstants();
|
||||||
|
|
||||||
if (isEmailMode) {
|
|
||||||
// Note: applyPunctuationOrder() requires the language to be set
|
|
||||||
KEY_CHARACTERS.add(applyPunctuationOrder(Characters.Email.get(0), 0));
|
|
||||||
KEY_CHARACTERS.add(applyPunctuationOrder(Characters.Email.get(1), 1));
|
|
||||||
} else {
|
|
||||||
setCustomSpecialCharacters();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -86,6 +78,22 @@ class ModeCheonjiin extends InputMode {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setLanguage(@Nullable Language newLanguage) {
|
||||||
|
super.setLanguage(newLanguage);
|
||||||
|
|
||||||
|
autoSpace.setLanguage(language);
|
||||||
|
|
||||||
|
KEY_CHARACTERS.clear();
|
||||||
|
if (isEmailMode) {
|
||||||
|
KEY_CHARACTERS.add(applyPunctuationOrder(Characters.Email.get(0), 0));
|
||||||
|
KEY_CHARACTERS.add(applyPunctuationOrder(Characters.Email.get(1), 1));
|
||||||
|
} else {
|
||||||
|
setCustomSpecialCharacters();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
protected void setSpecialCharacterConstants() {
|
protected void setSpecialCharacterConstants() {
|
||||||
CUSTOM_EMOJI_SEQUENCE = SPECIAL_CHAR_SEQUENCE_PREFIX + EmojiLanguage.CUSTOM_EMOJI_SEQUENCE;
|
CUSTOM_EMOJI_SEQUENCE = SPECIAL_CHAR_SEQUENCE_PREFIX + EmojiLanguage.CUSTOM_EMOJI_SEQUENCE;
|
||||||
EMOJI_SEQUENCE = SPECIAL_CHAR_SEQUENCE_PREFIX + EmojiLanguage.EMOJI_SEQUENCE;
|
EMOJI_SEQUENCE = SPECIAL_CHAR_SEQUENCE_PREFIX + EmojiLanguage.EMOJI_SEQUENCE;
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,6 @@ class ModeWords extends ModeCheonjiin {
|
||||||
@Override
|
@Override
|
||||||
protected void setLanguage(@Nullable Language newLanguage) {
|
protected void setLanguage(@Nullable Language newLanguage) {
|
||||||
super.setLanguage(newLanguage);
|
super.setLanguage(newLanguage);
|
||||||
autoSpace.setLanguage(language);
|
|
||||||
|
|
||||||
allowedTextCases.clear();
|
allowedTextCases.clear();
|
||||||
allowedTextCases.add(CASE_LOWER);
|
allowedTextCases.add(CASE_LOWER);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue