commit 23a7998edde3b25d4dc7a14b8a653ccd325d2405
author Dan Zivkovic <zivkovic@google.com> Fri Mar 27 12:19:47 2015 -0700
committer Dan Zivkovic <zivkovic@google.com> Fri Mar 27 12:19:47 2015 -0700
tree 3c9646349d6f6e2bf5fcdb1d68305d967bd7e863
parent 1b8cd52d7f2160f73c1ca37e4883362f2bc7771d

Not all cyrillic scripts use east_slavic layout.

Bug 19963288.

Change-Id: I6d61110be11b260a4ec8e8c85fa0a32064e051e3

java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java

diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
index 00f69f1..7d85170 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
+++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
@@ -125,7 +125,12 @@
         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 @@
     }
 
     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);