summaryrefslogtreecommitdiff
path: root/java/src/com/android/inputmethod/keyboard/KeyboardView.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-08-07 12:32:59 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-08-07 12:42:27 +0900
commite19c520b419faaf96180984528ae32b514a1bc77 (patch)
tree176b99bfee1877747936891b09ebb2291d1147e9 /java/src/com/android/inputmethod/keyboard/KeyboardView.java
parent3316dcd453a824b3da40a25fc83a46867e2aec59 (diff)
Align space key icon to bottom of a key
The Key.keyLabelFlags's flag "alignButtom" (misspelled) has been removed by Iae3cd66744. This CL re-introduce the same flag with "alignIconToBottom". Bug: 16803172 Change-Id: I412590f394c6ca9b36358d6acfe8675071403bdd
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/KeyboardView.java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardView.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 5af0be649..4a791f325 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -456,9 +456,13 @@ public class KeyboardView extends View {
iconWidth = Math.min(icon.getIntrinsicWidth(), keyWidth);
}
final int iconHeight = icon.getIntrinsicHeight();
- // Align center.
- final int iconY = (keyHeight - iconHeight) / 2;
- final int iconX = (keyWidth - iconWidth) / 2;
+ final int iconY;
+ if (key.isAlignIconToBottom()) {
+ iconY = keyHeight - iconHeight;
+ } else {
+ iconY = (keyHeight - iconHeight) / 2; // Align vertically center.
+ }
+ final int iconX = (keyWidth - iconWidth) / 2; // Align horizontally center.
drawIcon(canvas, icon, iconX, iconY, iconWidth, iconHeight);
}