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

Merge commit '9c822ec48de0e6839a861212d8b7143f70b29fd1'

* commit '9c822ec48de0e6839a861212d8b7143f70b29fd1':
  Fix mini keyboard display position when preview is disabled
main
Tadashi G. Takaoka 2010-09-21 10:44:22 -07:00 committed by Android Git Automerger
commit 75abaf5d8f
1 changed files with 1 additions and 1 deletions

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;