commit bbda98dc3ed719a182955be87f59ef25226244ec
author Jean Chalard <jchalard@google.com> Fri Jun 24 04:27:12 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 24 04:27:12 2011 -0700
tree 86f0b2bfc3952e45eea02b1ad0af8015497e08c3
parent 52344a0788db20d12960b2481e99e990c3de1ea4
parent 4f3d5d3733c070c0c16315b156068ae5c2aace6a

Merge "Add a link from Latin IME to the dictionary pack."

java/src/com/android/inputmethod/keyboard/LatinKeyboard.java

diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
index 76eac1a..00bf348 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
@@ -140,7 +140,7 @@
         // 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();