aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-08-22 07:49:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-22 07:49:11 +0000
commit543efa296ebd08ba1bb68a8022670079e74cce7a (patch)
tree552b2ecd7dd585080bed36e5bb038bb396cdd0db /tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
parent01d9955e8accf514dfc0b1d6590e7b9ab5c357b0 (diff)
parentf429d8f138d7e9aed8cdae774bfc8854025d3a40 (diff)
downloadlatinime-543efa296ebd08ba1bb68a8022670079e74cce7a.tar.gz
latinime-543efa296ebd08ba1bb68a8022670079e74cce7a.tar.xz
latinime-543efa296ebd08ba1bb68a8022670079e74cce7a.zip
am f429d8f1: Merge "[ML1] Introduce RichInputMethodSubtype"
* commit 'f429d8f138d7e9aed8cdae774bfc8854025d3a40': [ML1] Introduce RichInputMethodSubtype
Diffstat (limited to 'tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java')
-rw-r--r--tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java3
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();