Merge "Draw language label on space key of symbol+alt mode" into gingerbread
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
index 5ec5eb9..a2db129 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
@@ -1119,7 +1119,7 @@
popupY -= container.getMeasuredHeight();
popupY += container.getPaddingBottom();
final int x = popupX;
- final int y = isOneRowKeyboard(mMiniKeyboard.getKeyboard())
+ final int y = mShowPreview && isOneRowKeyboard(mMiniKeyboard.getKeyboard())
? mPopupPreviewDisplayedY : popupY;
int adjustedX = x;