am 7c120ce4: am 3a2896c8: Fix issue space key preview remains on screen and would not dismiss

Merge commit '7c120ce4872398ea4f61a67aba1d069e45f1c012'

* commit '7c120ce4872398ea4f61a67aba1d069e45f1c012':
  Fix issue space key preview remains on screen and would not dismiss

1 files changed, 5 insertions, 1 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 8b89f3900..d39766d53 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -131,7 +131,7 @@ public class LatinKeyboard extends Keyboard {
                 R.dimen.spacebar_vertical_correction);
         mIsAlphaKeyboard = xmlLayoutResId == R.xml.kbd_qwerty
                 || xmlLayoutResId == R.xml.kbd_qwerty_black;
-        mSpaceKeyIndex = indexOf(' ');
+        mSpaceKeyIndex = indexOf(LatinIME.KEYCODE_SPACE);
         initializeNumberHintResources(context);
     }
 
@@ -384,6 +384,10 @@ public class LatinKeyboard extends Keyboard {
         }
     }
 
+    public boolean isLanguageSwitchEnabled() {
+        return mLocale != null;
+    }
+
     private void updateSpaceBarForLocale(boolean isAutoCompletion, boolean isBlack) {
         // If application locales are explicitly selected.
         if (mLocale != null) {