commit 0dd778f832809ef90a37dd9b90c57082ec1e0441
author Tadashi G. Takaoka <takaoka@google.com> Fri Jun 03 09:04:50 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 03 09:04:50 2011 -0700
tree 4709ae515af272c0cef56efa51a7f74a89c5d569
parent abd7392d66fcfd404b7763edaf3fced5c97c8f43
parent f03883025fa35e4335984bd7536363b18351b5cb

Merge "Fix mini keyboard position"

java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java b/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
index fa2aa87..60d87f7 100644
--- a/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
@@ -76,9 +76,11 @@
         final int pointX = (mConfigShowMiniKeyboardAtTouchedPoint) ? tracker.getLastX()
                 : parentKey.mX + parentKey.mWidth / 2;
         final int pointY = parentKey.mY;
-        final int miniKeyboardX = pointX - miniKeyboard.getDefaultCoordX()
-                - container.getPaddingLeft()
-                + parentKeyboardView.getPaddingLeft() + mCoordinates[0];
+        final int miniKeyboardLeft = pointX - miniKeyboard.getDefaultCoordX()
+                + parentKeyboardView.getPaddingLeft();
+        final int miniKeyboardX = Math.max(0, Math.min(miniKeyboardLeft,
+                parentKeyboardView.getWidth() - miniKeyboard.getMinWidth()))
+                - container.getPaddingLeft() + mCoordinates[0];
         final int miniKeyboardY = pointY - parentKeyboard.getVerticalGap()
                 - (container.getMeasuredHeight() - container.getPaddingBottom())
                 + parentKeyboardView.getPaddingTop() + mCoordinates[1];