aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2010-09-23 00:05:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-23 00:05:15 -0700
commitec8b7360161f37d00d178bef37c30352982cd007 (patch)
tree773ddfdaf83c30a3286d9dddd0f15fce60824d1b /java
parenta8f77c36ca985cb356b03b25f5cd30fd3b25dc9a (diff)
parent77542988b809fba6a59aa86982eb4d9e4269477e (diff)
downloadlatinime-ec8b7360161f37d00d178bef37c30352982cd007.tar.gz
latinime-ec8b7360161f37d00d178bef37c30352982cd007.tar.xz
latinime-ec8b7360161f37d00d178bef37c30352982cd007.zip
am 77542988: Tune left and right padding of popup mini keyboard
Merge commit '77542988b809fba6a59aa86982eb4d9e4269477e' into gingerbread-plus-aosp * commit '77542988b809fba6a59aa86982eb4d9e4269477e': Tune left and right padding of popup mini keyboard
Diffstat (limited to 'java')
-rw-r--r--java/res/layout/keyboard_popup.xml2
-rw-r--r--java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/java/res/layout/keyboard_popup.xml b/java/res/layout/keyboard_popup.xml
index 9a52e2cbd..27388e06b 100644
--- a/java/res/layout/keyboard_popup.xml
+++ b/java/res/layout/keyboard_popup.xml
@@ -23,6 +23,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/keyboard_popup_panel_background"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
>
<com.android.inputmethod.latin.LatinKeyboardBaseView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
index eeccb965c..92266c5f1 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
@@ -1129,7 +1129,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
if (isNumberAtLeftmost) {
popupX -= container.getPaddingLeft();
} else {
- popupX += popupKey.width + getPaddingLeft();
+ popupX += popupKey.width + container.getPaddingLeft();
popupX -= container.getMeasuredWidth();
popupX += container.getPaddingRight();
}