From b86ca76cea9aedf47a81f9272fb59897de3bbbe7 Mon Sep 17 00:00:00 2001 From: Dan Zivkovic Date: Fri, 6 Mar 2015 14:34:57 -0800 Subject: Handle null InputMethodSubtype. Bug 19627494. Change-Id: I50dc77c59ced0f2e7c07a49ae0cb040197c2ab35 --- .../android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java | 2 +- .../com/android/inputmethod/latin/RichInputMethodSubtypeTests.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/src') diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java index 7f828111d..29787acc9 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java @@ -159,7 +159,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(RichInputMethodSubtype.getRichInputMethodSubtype(subtype)) .setVoiceInputKeyEnabled(voiceInputKeyEnabled) .setLanguageSwitchKeyEnabled(languageSwitchKeyEnabled) .setSplitLayoutEnabledByUser(splitLayoutEnabled); diff --git a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java b/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java index 9c8e16511..d59890a96 100644 --- a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java +++ b/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java @@ -318,4 +318,11 @@ public class RichInputMethodSubtypeTests extends AndroidTestCase { public void testAdditionalSubtypeForSpacebarInFrench() { testsAdditionalSubtypesForSpacebar.runInLocale(mRes, Locale.FRENCH); } + + public void testRichInputMethodSubtypeForNullInputMethodSubtype() { + RichInputMethodSubtype subtype = RichInputMethodSubtype.getRichInputMethodSubtype(null); + assertNotNull(subtype); + assertEquals("zz", subtype.getRawSubtype().getLocale()); + assertEquals("keyboard", subtype.getRawSubtype().getMode()); + } } -- cgit v1.2.3-83-g751a