aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/com/android/inputmethod/latin/InputTestsBase.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-08-22 01:02:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-22 01:02:04 -0700
commit50e7501722427aabdd280201e5e1bbfaeac76fab (patch)
tree0b99951c95bbc9e1a2523470b9db948b53cadb40 /tests/src/com/android/inputmethod/latin/InputTestsBase.java
parentdde36ef34329164cf8b8a3985c578dab0343b3eb (diff)
parent9fc6af325ec91a1a22c0679d374c0c3d6d03d9ac (diff)
downloadlatinime-50e7501722427aabdd280201e5e1bbfaeac76fab.tar.gz
latinime-50e7501722427aabdd280201e5e1bbfaeac76fab.tar.xz
latinime-50e7501722427aabdd280201e5e1bbfaeac76fab.zip
Merge "Fix SubtypeSwitcher initialization path" into jb-mr1-dev
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/InputTestsBase.java')
-rw-r--r--tests/src/com/android/inputmethod/latin/InputTestsBase.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/src/com/android/inputmethod/latin/InputTestsBase.java b/tests/src/com/android/inputmethod/latin/InputTestsBase.java
index 9feec2be9..ffd95f57a 100644
--- a/tests/src/com/android/inputmethod/latin/InputTestsBase.java
+++ b/tests/src/com/android/inputmethod/latin/InputTestsBase.java
@@ -135,7 +135,6 @@ public class InputTestsBase extends ServiceTestCase<LatinIME> {
mLatinIME.onCreateInputView();
mLatinIME.onStartInputView(ei, false);
mInputConnection = ic;
- mKeyboard = mLatinIME.mKeyboardSwitcher.getKeyboard();
changeLanguage("en_US");
}
@@ -253,6 +252,8 @@ public class InputTestsBase extends ServiceTestCase<LatinIME> {
fail("InputMethodSubtype for locale " + locale + " is not enabled");
}
SubtypeSwitcher.getInstance().updateSubtype(subtype);
+ mLatinIME.loadKeyboard();
+ mKeyboard = mLatinIME.mKeyboardSwitcher.getKeyboard();
waitForDictionaryToBeLoaded();
}