diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-28 14:40:06 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-10-28 15:02:31 +0900 |
| commit | 395009c03eeda42b2b2114d005c3ed8d7e4bfd4b (patch) | |
| tree | a2d63060e306ae638b37e42f7de8534988a73b36 /tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java | |
| parent | d5455fea4ad710e4b31890affe8efab948fe586e (diff) | |
| download | latinime-395009c03eeda42b2b2114d005c3ed8d7e4bfd4b.tar.gz latinime-395009c03eeda42b2b2114d005c3ed8d7e4bfd4b.tar.xz latinime-395009c03eeda42b2b2114d005c3ed8d7e4bfd4b.zip | |
Fix NPE in AppearanceSettingsFragment
Bug: 18147440
Change-Id: I7a7a47b3484e54146d34d11b5bd9c1305421d829
Diffstat (limited to 'tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java index ec836ccca..2361968a1 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java @@ -87,7 +87,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase { setContext(new ContextThemeWrapper(getContext(), keyboardTheme.mStyleId)); KeyboardLayoutSet.onKeyboardThemeChanged(); - mScreenMetrics = res.getInteger(R.integer.config_screen_metrics); + mScreenMetrics = Settings.readScreenMetrics(res); RichInputMethodManager.init(context); final RichInputMethodManager richImm = RichInputMethodManager.getInstance(); @@ -121,8 +121,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase { } protected final boolean isPhone() { - return mScreenMetrics == Constants.SCREEN_METRICS_SMALL_PHONE - || mScreenMetrics == Constants.SCREEN_METRICS_LARGE_PHONE; + return Constants.isPhone(mScreenMetrics); } protected final InputMethodSubtype getSubtype(final Locale locale, |