diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-xlarge-land/dimens.xml | 12 | ||||
| -rw-r--r-- | java/res/values-xlarge/dimens.xml | 6 | ||||
| -rw-r--r-- | java/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardView.java | 5 |
4 files changed, 20 insertions, 5 deletions
diff --git a/java/res/values-xlarge-land/dimens.xml b/java/res/values-xlarge-land/dimens.xml index 5b9d50abc..8737caef6 100644 --- a/java/res/values-xlarge-land/dimens.xml +++ b/java/res/values-xlarge-land/dimens.xml @@ -19,6 +19,18 @@ --> <resources> + <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 --> + <dimen name="keyboardHeight">58.0mm</dimen> + <!-- key_height + key_bottom_gap = popup_key_height --> + <!-- <dimen name="key_height">14.5mm</dimen> --> + <dimen name="key_bottom_gap">0.0mm</dimen> + <dimen name="key_horizontal_gap">0.0mm</dimen> + <dimen name="popup_key_height">13.0mm</dimen> + <dimen name="keyboard_top_padding">0.0mm</dimen> + <dimen name="keyboard_bottom_padding">0.0mm</dimen> + <!-- key_height x 1.0 --> + <dimen name="key_preview_height">13.0mm</dimen> + <dimen name="key_letter_size">28dip</dimen> <dimen name="key_label_text_size">20dip</dimen> <!-- left or right padding of label alignment --> diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml index 07d5f09bd..7969b7672 100644 --- a/java/res/values-xlarge/dimens.xml +++ b/java/res/values-xlarge/dimens.xml @@ -20,12 +20,12 @@ <resources> <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 --> - <dimen name="keyboardHeight">58.0mm</dimen> + <dimen name="keyboardHeight">48.0mm</dimen> <!-- key_height + key_bottom_gap = popup_key_height --> -<!-- <dimen name="key_height">14.5mm</dimen>--> + <!-- <dimen name="key_height">14.5mm</dimen> --> <dimen name="key_bottom_gap">0.0mm</dimen> <dimen name="key_horizontal_gap">0.0mm</dimen> - <dimen name="popup_key_height">13.0mm</dimen> + <dimen name="popup_key_height">10.0mm</dimen> <dimen name="keyboard_top_padding">0.0mm</dimen> <dimen name="keyboard_bottom_padding">0.0mm</dimen> <!-- key_height x 1.0 --> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 41d638440..cf2019ff8 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -22,7 +22,7 @@ <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 --> <dimen name="keyboardHeight">1.265in</dimen> <!-- key_height + key_bottom_gap = popup_key_height --> -<!-- <dimen name="key_height">0.290in</dimen>--> + <!-- <dimen name="key_height">0.290in</dimen> --> <dimen name="key_bottom_gap">0.035in</dimen> <dimen name="key_horizontal_gap">0.000in</dimen> <dimen name="popup_key_height">0.325in</dimen> diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 70267a7ff..4a3a58b94 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -174,7 +174,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { // This map caches key label text height in pixel as value and key label text size as map key. private final HashMap<Integer, Integer> mTextHeightCache = new HashMap<Integer, Integer>(); // Distance from horizontal center of the key, proportional to key label text height and width. - private final float KEY_LABEL_VERTICAL_ADJUSTMENT_FACTOR_CENTER = 0.55f; + private final float KEY_LABEL_VERTICAL_ADJUSTMENT_FACTOR_CENTER = 0.45f; private final float KEY_LABEL_VERTICAL_PADDING_FACTOR = 1.60f; private final String KEY_LABEL_REFERENCE_CHAR = "H"; private final int KEY_LABEL_OPTION_ALIGN_LEFT = 1; @@ -727,6 +727,9 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { final float centerY = (key.mHeight + padding.top - padding.bottom) / 2; baseline = centerY + labelCharHeight * KEY_LABEL_VERTICAL_ADJUSTMENT_FACTOR_CENTER; + if (DEBUG_SHOW_ALIGN) + drawHorizontalLine(canvas, (int)baseline, key.mWidth, 0xc0008000, + new Paint()); } // Horizontal label text alignment final int positionX; |