diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-25 04:42:15 +0000 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2014-08-25 04:42:15 +0000 |
| commit | 85ddfe1317a4475269e53f62c2338c335e02e839 (patch) | |
| tree | d87b69289b18a68d39a289e1e66ded06da583253 /tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java | |
| parent | a63d0a8ee6cb05bcddb69bf9a6018853d89d886a (diff) | |
| download | latinime-85ddfe1317a4475269e53f62c2338c335e02e839.tar.gz latinime-85ddfe1317a4475269e53f62c2338c335e02e839.tar.xz latinime-85ddfe1317a4475269e53f62c2338c335e02e839.zip | |
Revert "Revert "[ML1] Introduce RichInputMethodSubtype""
This reverts commit a63d0a8ee6cb05bcddb69bf9a6018853d89d886a.
This patch seems to be fine after all, but was submitted without its companion [ML1.1] patch causing a build breakage. Reverting the revert and submitting both at the same time seems like the right thing to do.
Change-Id: Ib8fefa40b74dcee0edb025a52dac9b35c82d49df
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, 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(); |