diff options
| author |   Yusuke Nojima <nojima@google.com> | 2011-08-15 20:43:00 +0900 |
|---|---|---|
| committer | Yusuke Nojima <nojima@google.com> | 2011-08-16 10:07:34 +0900 |
| commit | 35775197aaf5fa470c0d22ca63eb9f7741b42c52 (patch) | |
| tree | d12eb82eedb606cba37f34e4e4719d55cb62c3f7 /java/src | |
| parent | d4c08d9be3540466c8253ee02fecf4b6035d8ee0 (diff) | |
| download | latinime-35775197aaf5fa470c0d22ca63eb9f7741b42c52.tar.gz latinime-35775197aaf5fa470c0d22ca63eb9f7741b42c52.tar.xz latinime-35775197aaf5fa470c0d22ca63eb9f7741b42c52.zip | |
Add a margin between "123" and the mic icon.
Bug: 5161711
Change-Id: I04c777c24b9aac4d82eb3adff8e077640a866f61
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardView.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 2df2994f6..451a9db3a 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -83,6 +83,11 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // HORIZONTAL ELLIPSIS "...", character for popup hint. private static final String POPUP_HINT_CHAR = "\u2026"; + // Margin between the label and the icon on a key that has both of them. + // Specified by the fraction of the key width. + // TODO: Use resource parameter for this value. + private static final float LABEL_ICON_MARGIN = 0.05f; + // Main keyboard private Keyboard mKeyboard; private final KeyDrawParams mKeyDrawParams; @@ -538,11 +543,13 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { positionX = centerX - labelCharWidth * 7 / 4; paint.setTextAlign(Align.LEFT); } else if (key.hasLabelWithIconLeft() && icon != null) { - labelWidth = getLabelWidth(label, paint) + icon.getIntrinsicWidth(); + labelWidth = getLabelWidth(label, paint) + icon.getIntrinsicWidth() + + (int)(LABEL_ICON_MARGIN * keyWidth); positionX = centerX + labelWidth / 2; paint.setTextAlign(Align.RIGHT); } else if (key.hasLabelWithIconRight() && icon != null) { - labelWidth = getLabelWidth(label, paint) + icon.getIntrinsicWidth(); + labelWidth = getLabelWidth(label, paint) + icon.getIntrinsicWidth() + + (int)(LABEL_ICON_MARGIN * keyWidth); positionX = centerX - labelWidth / 2; paint.setTextAlign(Align.LEFT); } else { |