diff options
author | Tadashi G. Takaoka <takaoka@google.com> | 2010-09-17 00:05:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 00:05:52 -0700 |
commit | 2c7ab0854e1dfa7b4d239a0c59aa69b57e44f23e (patch) | |
tree | e5c3b9f81670026e5448e74aa1fa20db8fde6d0d /core/java/android/inputmethodservice/Keyboard.java | |
parent | f81174b281decbf689ab3727fbbbadf3aee056f5 (diff) | |
parent | a79433cb66c83b3a27e94e42aef95cbae752bcc5 (diff) | |
download | frameworks_base-2c7ab0854e1dfa7b4d239a0c59aa69b57e44f23e.zip frameworks_base-2c7ab0854e1dfa7b4d239a0c59aa69b57e44f23e.tar.gz frameworks_base-2c7ab0854e1dfa7b4d239a0c59aa69b57e44f23e.tar.bz2 |
am a79433cb: am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Merge commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5'
* commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5':
Initialize Keyboard.Key attributes from parent Keyboard.Row
Diffstat (limited to 'core/java/android/inputmethodservice/Keyboard.java')
-rw-r--r--[-rwxr-xr-x] | core/java/android/inputmethodservice/Keyboard.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/inputmethodservice/Keyboard.java b/core/java/android/inputmethodservice/Keyboard.java index 885a6b8..75c945b 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 @@ -587,9 +591,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++; |