diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-25 05:30:53 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 05:30:53 +0000 |
| commit | adfb74a41e8a42d4e2276b6b42eded8c6ccf2b70 (patch) | |
| tree | 6eb8f4a2d529df53d7379a31fbb35656f16327f4 /tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java | |
| parent | aec45a533672df82ad5af1c0c0fdf045bccc8256 (diff) | |
| parent | dc44260484a27d360c48daa069e7f3b7c07d12a2 (diff) | |
| download | latinime-adfb74a41e8a42d4e2276b6b42eded8c6ccf2b70.tar.gz latinime-adfb74a41e8a42d4e2276b6b42eded8c6ccf2b70.tar.xz latinime-adfb74a41e8a42d4e2276b6b42eded8c6ccf2b70.zip | |
am dc442604: Merge "Revert "Revert "[ML1] Introduce RichInputMethodSubtype"""
* commit 'dc44260484a27d360c48daa069e7f3b7c07d12a2':
Revert "Revert "[ML1] Introduce RichInputMethodSubtype""
Diffstat (limited to '')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java index cf884bfea..22460ef7d 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java @@ -29,6 +29,7 @@ import com.android.inputmethod.keyboard.KeyboardLayoutSet.Builder; import com.android.inputmethod.latin.Constants; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.RichInputMethodManager; +import com.android.inputmethod.latin.RichInputMethodSubtype; import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils; import com.android.inputmethod.latin.utils.ResourceUtils; import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; @@ -127,7 +128,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase { final int keyboardHeight = ResourceUtils.getDefaultKeyboardHeight(res); final Builder builder = new Builder(context, editorInfo); builder.setKeyboardGeometry(keyboardWidth, keyboardHeight) - .setSubtype(subtype) + .setSubtype(new RichInputMethodSubtype(subtype)) .setVoiceInputKeyEnabled(voiceInputKeyEnabled) .setLanguageSwitchKeyEnabled(languageSwitchKeyEnabled); return builder.build(); |