am 6b75eaa1: Fix mini keyboard display position when preview is disabled

Merge commit '6b75eaa12d69c1db048985a19df85215998f321e' into gingerbread-plus-aosp

* commit '6b75eaa12d69c1db048985a19df85215998f321e':
  Fix mini keyboard display position when preview is disabled
This commit is contained in:
Tadashi G. Takaoka 2010-09-21 07:18:41 -07:00 committed by Android Git Automerger
commit 9c822ec48d

View file

@ -1119,7 +1119,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
popupY -= container.getMeasuredHeight(); popupY -= container.getMeasuredHeight();
popupY += container.getPaddingBottom(); popupY += container.getPaddingBottom();
final int x = popupX; final int x = popupX;
final int y = isOneRowKeyboard(mMiniKeyboard.getKeyboard()) final int y = mShowPreview && isOneRowKeyboard(mMiniKeyboard.getKeyboard())
? mPopupPreviewDisplayedY : popupY; ? mPopupPreviewDisplayedY : popupY;
int adjustedX = x; int adjustedX = x;