Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23a7998e authored by Dan Zivkovic's avatar Dan Zivkovic
Browse files

Not all cyrillic scripts use east_slavic layout.

Bug 19963288.

Change-Id: I6d61110be11b260a4ec8e8c85fa0a32064e051e3
parent 1b8cd52d
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -125,7 +125,12 @@ public final class AndroidSpellCheckerService extends SpellCheckerService
        return mRecommendedThreshold;
    }

    private static String getKeyboardLayoutNameForScript(final int script) {
    private static String getKeyboardLayoutNameForLocale(final Locale locale) {
        // See b/19963288.
        if (locale.getLanguage().equals("sr")) {
            return "south_slavic";
        }
        final int script = ScriptUtils.getScriptFromSpellCheckerLocale(locale);
        switch (script) {
        case ScriptUtils.SCRIPT_LATIN:
            return "qwerty";
@@ -247,8 +252,7 @@ public final class AndroidSpellCheckerService extends SpellCheckerService
    }

    private Keyboard createKeyboardForLocale(final Locale locale) {
        final int script = ScriptUtils.getScriptFromSpellCheckerLocale(locale);
        final String keyboardLayoutName = getKeyboardLayoutNameForScript(script);
        final String keyboardLayoutName = getKeyboardLayoutNameForLocale(locale);
        final InputMethodSubtype subtype = AdditionalSubtypeUtils.createDummyAdditionalSubtype(
                locale.toString(), keyboardLayoutName);
        final KeyboardLayoutSet keyboardLayoutSet = createKeyboardSetForSpellChecker(subtype);