diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-22 09:48:39 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 09:48:39 +0000 |
| commit | 9df7e3b8e941dcfdf30ab2262530d08b45051737 (patch) | |
| tree | 8a93b513e98b0bdff6e96142a4bd1c1539bacece /tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java | |
| parent | bf55d9f0e694202bbe11ddbf985fa9f6729acc25 (diff) | |
| parent | 6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32 (diff) | |
| download | latinime-9df7e3b8e941dcfdf30ab2262530d08b45051737.tar.gz latinime-9df7e3b8e941dcfdf30ab2262530d08b45051737.tar.xz latinime-9df7e3b8e941dcfdf30ab2262530d08b45051737.zip | |
am 6c638d1b: Merge "Revert "[ML1] Introduce RichInputMethodSubtype""
* commit '6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32':
Revert "[ML1] Introduce RichInputMethodSubtype"
Diffstat (limited to 'tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java index 22460ef7d..cf884bfea 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java @@ -29,7 +29,6 @@ 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; @@ -128,7 +127,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(new RichInputMethodSubtype(subtype)) + .setSubtype(subtype) .setVoiceInputKeyEnabled(voiceInputKeyEnabled) .setLanguageSwitchKeyEnabled(languageSwitchKeyEnabled); return builder.build(); |