diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-03 20:19:58 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-11-03 20:19:58 -0700 |
| commit | b8291fb46bbf852237416d94979d51b867c160f7 (patch) | |
| tree | b71b346c6b543c7f889a609af74397e36ab6f425 /java/src | |
| parent | fb2f9c1bb1e98f456476fd4a6339234a1ad47f56 (diff) | |
| parent | 80e9bd34d19e37c0cea7d2c42d8fea3ff0c56c32 (diff) | |
| download | latinime-b8291fb46bbf852237416d94979d51b867c160f7.tar.gz latinime-b8291fb46bbf852237416d94979d51b867c160f7.tar.xz latinime-b8291fb46bbf852237416d94979d51b867c160f7.zip | |
Merge "Do not clip the popup key preview even if there is no left/right preview icons"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardView.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 04e672590..3ce184941 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -906,12 +906,16 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { int previewX = keyDrawX - (previewWidth - keyDrawWidth) / 2 + params.mCoordinates[0]; final int previewY = key.mY - previewHeight + params.mCoordinates[1] + params.mPreviewOffset; - if (previewX < 0 && params.mPreviewLeftBackground != null) { - previewText.setBackgroundDrawable(params.mPreviewLeftBackground); + if (previewX < 0) { previewX = 0; - } else if (previewX + previewWidth > getWidth() && params.mPreviewRightBackground != null) { - previewText.setBackgroundDrawable(params.mPreviewRightBackground); + if (params.mPreviewLeftBackground != null) { + previewText.setBackgroundDrawable(params.mPreviewLeftBackground); + } + } else if (previewX > getWidth() - previewWidth) { previewX = getWidth() - previewWidth; + if (params.mPreviewRightBackground != null) { + previewText.setBackgroundDrawable(params.mPreviewRightBackground); + } } // Set the preview background state |