aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2011-06-23 22:51:05 +0900
committerKen Wakasa <kwakasa@google.com>2011-06-24 15:31:09 +0900
commit52344a0788db20d12960b2481e99e990c3de1ea4 (patch)
tree5f3fed92b64ef078bd9afec21b9d9b5358d681ce /java/src
parent2442e779857e7eda253aadcb1c4dff5ccb3e53f4 (diff)
downloadlatinime-52344a0788db20d12960b2481e99e990c3de1ea4.tar.gz
latinime-52344a0788db20d12960b2481e99e990c3de1ea4.tar.xz
latinime-52344a0788db20d12960b2481e99e990c3de1ea4.zip
Fix NPE with the unit test
Change-Id: I0836f8b7191287bcff65cdc8a8ce0ff7484e9f65
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/LatinKeyboard.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
index 76eac1ac8..00bf348f2 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
@@ -140,7 +140,7 @@ public class LatinKeyboard extends Keyboard {
// The threshold is "key width" x 1.25
mSpacebarLanguageSwitchThreshold = (getMostCommonKeyWidth() * 5) / 4;
- if (mSpaceKey != null) {
+ if (mSpaceKey != null && mSpacePreviewIcon != null) {
final int slidingIconWidth = Math.max(mSpaceKey.mWidth,
(int)(getMinWidth() * SPACEBAR_POPUP_MIN_RATIO));
final int spaceKeyheight = mSpacePreviewIcon.getIntrinsicHeight();