the LF4 key now displays the language in Predictive mode (also no more toast on mode change, except in invisible mode)
This commit is contained in:
parent
348627bfbf
commit
6e0c32b17d
3 changed files with 13 additions and 6 deletions
|
|
@ -318,7 +318,7 @@ public abstract class HotkeyHandler extends CommandHandler {
|
||||||
statusBar.setText(mInputMode);
|
statusBar.setText(mInputMode);
|
||||||
suggestionOps.setRTL(isLanguageRTL);
|
suggestionOps.setRTL(isLanguageRTL);
|
||||||
mainView.render();
|
mainView.render();
|
||||||
if (!suggestionOps.isEmpty() || settings.isMainLayoutStealth()) {
|
if (settings.isMainLayoutStealth() && !settings.isStatusIconEnabled()) {
|
||||||
UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
|
UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -347,7 +347,7 @@ public abstract class HotkeyHandler extends CommandHandler {
|
||||||
statusBar.setText(mInputMode);
|
statusBar.setText(mInputMode);
|
||||||
mainView.render();
|
mainView.render();
|
||||||
|
|
||||||
if (settings.isMainLayoutStealth()) {
|
if (settings.isMainLayoutStealth() && !settings.isStatusIconEnabled()) {
|
||||||
UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
|
UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -373,7 +373,7 @@ public abstract class HotkeyHandler extends CommandHandler {
|
||||||
statusBar.setText(mInputMode);
|
statusBar.setText(mInputMode);
|
||||||
mainView.render();
|
mainView.render();
|
||||||
|
|
||||||
if (settings.isMainLayoutStealth()) {
|
if (settings.isMainLayoutStealth() && !settings.isStatusIconEnabled()) {
|
||||||
UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
|
UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@ abstract public class MainViewHandler extends HotkeyHandler {
|
||||||
} else if (InputModeKind.isKatakana(mInputMode)) {
|
} else if (InputModeKind.isKatakana(mInputMode)) {
|
||||||
return "ア";
|
return "ア";
|
||||||
} else if (InputModeKind.isPredictive(mInputMode)) {
|
} else if (InputModeKind.isPredictive(mInputMode)) {
|
||||||
return "T9";
|
return mLanguage != null ? mLanguage.getCode().toUpperCase(mLanguage.getLocale()) : "T9";
|
||||||
} else if (InputModeKind.isNumeric(mInputMode)){
|
} else if (InputModeKind.isNumeric(mInputMode)){
|
||||||
return "123";
|
return "123";
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -41,15 +41,22 @@ class LocaleCompat {
|
||||||
return switch (language) {
|
return switch (language) {
|
||||||
case "ar" -> "ع";
|
case "ar" -> "ع";
|
||||||
case "bg" -> "бг";
|
case "bg" -> "бг";
|
||||||
case "en" -> ("in".equals(country)) ? "hn" : language; // en-IN = Hinglish
|
case "en" -> "in".equals(country) ? "hn" : language; // en-IN = Hinglish
|
||||||
case "fa" -> "ف";
|
case "fa" -> "ف";
|
||||||
case "fi" -> "su";
|
case "fi" -> "su";
|
||||||
|
case "el" -> "ελ";
|
||||||
|
case "gu" -> "ગુ";
|
||||||
case "he", "iw" -> "אב";
|
case "he", "iw" -> "אב";
|
||||||
|
case "hi" -> "ह";
|
||||||
case "hu" -> "mg";
|
case "hu" -> "mg";
|
||||||
case "ji", "yi" -> "יי";
|
case "ji", "yi" -> "יי";
|
||||||
|
case "ja" -> "漢";
|
||||||
|
case "ko" -> "한";
|
||||||
case "ru" -> "ру";
|
case "ru" -> "ру";
|
||||||
|
case "th" -> "ไท";
|
||||||
case "uk" -> "ук";
|
case "uk" -> "ук";
|
||||||
case "zgh" -> "tm";
|
case "zgh" -> "dz".equals(country) ? "tm" : "ⵜⵎ";
|
||||||
|
case "zh" -> "cn".equals(country) ? "拼" : language;
|
||||||
case "ca", "ga", "sw" -> language;
|
case "ca", "ga", "sw" -> language;
|
||||||
default -> country;
|
default -> country;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue