diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-08-22 01:03:20 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-22 01:03:20 -0700 |
| commit | 64f8723a507be3a855af935c51f954a3528ccac6 (patch) | |
| tree | 0b99951c95bbc9e1a2523470b9db948b53cadb40 /tests/src/com/android/inputmethod/latin/InputTestsBase.java | |
| parent | 50849d4b2d9acc1c38e19f20e39da33bf3d1d575 (diff) | |
| parent | 50e7501722427aabdd280201e5e1bbfaeac76fab (diff) | |
| download | latinime-64f8723a507be3a855af935c51f954a3528ccac6.tar.gz latinime-64f8723a507be3a855af935c51f954a3528ccac6.tar.xz latinime-64f8723a507be3a855af935c51f954a3528ccac6.zip | |
am 50e75017: Merge "Fix SubtypeSwitcher initialization path" into jb-mr1-dev
* commit '50e7501722427aabdd280201e5e1bbfaeac76fab':
Fix SubtypeSwitcher initialization path
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/InputTestsBase.java')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/InputTestsBase.java | 3 |
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(); } |