summaryrefslogtreecommitdiffstats
path: root/core/java/android/inputmethodservice/Keyboard.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2010-09-17 15:28:47 +0900
committerTadashi G. Takaoka <takaoka@google.com>2010-09-17 15:40:35 +0900
commitb65b7cb5808a3cea59cbfa72ecd46bdda90351fa (patch)
tree106494aa12f0c564dd717a9f25451fc99682817c /core/java/android/inputmethodservice/Keyboard.java
parent9404e633a55cd325b57732cdd776053b3886b611 (diff)
downloadframeworks_base-b65b7cb5808a3cea59cbfa72ecd46bdda90351fa.zip
frameworks_base-b65b7cb5808a3cea59cbfa72ecd46bdda90351fa.tar.gz
frameworks_base-b65b7cb5808a3cea59cbfa72ecd46bdda90351fa.tar.bz2
Initialize Keyboard.Key attributes from parent Keyboard.Row
Bug: 3009940 Change-Id: I22ef3e507c31e46b7581e20bcdd6b5ebc750adfe
Diffstat (limited to 'core/java/android/inputmethodservice/Keyboard.java')
-rw-r--r--[-rwxr-xr-x]core/java/android/inputmethodservice/Keyboard.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/inputmethodservice/Keyboard.java b/core/java/android/inputmethodservice/Keyboard.java
index 4814b0a..269e1c9 100755..100644
--- a/core/java/android/inputmethodservice/Keyboard.java
+++ b/core/java/android/inputmethodservice/Keyboard.java
@@ -307,6 +307,10 @@ public class Keyboard {
/** Create an empty key with no attributes. */
public Key(Row parent) {
keyboard = parent.parent;
+ height = parent.defaultHeight;
+ width = parent.defaultWidth;
+ gap = parent.defaultHorizontalGap;
+ edgeFlags = parent.rowEdgeFlags;
}
/** Create a key with the given top-left coordinate and extract its attributes from
@@ -564,9 +568,6 @@ public class Keyboard {
final Key key = new Key(row);
key.x = x;
key.y = y;
- key.width = mDefaultWidth;
- key.height = mDefaultHeight;
- key.gap = mDefaultHorizontalGap;
key.label = String.valueOf(c);
key.codes = new int[] { c };
column++;