aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-08-22 01:05:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-22 01:05:12 -0700
commitcb7feb42e99bedf3e1e8c286123ad424e02f1aaa (patch)
tree0b99951c95bbc9e1a2523470b9db948b53cadb40 /tests/src
parent12ebfe863bc7c868568a4d404cda22ffb28bdb59 (diff)
parent64f8723a507be3a855af935c51f954a3528ccac6 (diff)
downloadlatinime-cb7feb42e99bedf3e1e8c286123ad424e02f1aaa.tar.gz
latinime-cb7feb42e99bedf3e1e8c286123ad424e02f1aaa.tar.xz
latinime-cb7feb42e99bedf3e1e8c286123ad424e02f1aaa.zip
am 64f8723a: am 50e75017: Merge "Fix SubtypeSwitcher initialization path" into jb-mr1-dev
* commit '64f8723a507be3a855af935c51f954a3528ccac6': Fix SubtypeSwitcher initialization path
Diffstat (limited to 'tests/src')
-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();
}