diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-09-21 07:18:41 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 07:18:41 -0700 |
| commit | 9c822ec48de0e6839a861212d8b7143f70b29fd1 (patch) | |
| tree | dc79392daa720bc2cd76278b927d290752a980f7 /java/src | |
| parent | 1d82ee9a13b1e57af80d2bd0e3f879305bda137d (diff) | |
| parent | 6b75eaa12d69c1db048985a19df85215998f321e (diff) | |
| download | latinime-9c822ec48de0e6839a861212d8b7143f70b29fd1.tar.gz latinime-9c822ec48de0e6839a861212d8b7143f70b29fd1.tar.xz latinime-9c822ec48de0e6839a861212d8b7143f70b29fd1.zip | |
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
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java index 5ec5eb9d9..a2db12979 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java @@ -1119,7 +1119,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx 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; |