Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread

Browse Source 
Merge commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be' into gingerbread-plus-aosp

* commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be':
  Initialize Keyboard.Key attributes from parent Keyboard.Row
This commit is contained in:
Tadashi G. Takaoka
2010-09-17 00:03:32 -07:00
committed by Android Git Automerger
parent f3f822edc7 ecd43cca42
commit a79433cb66
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/inputmethodservice/Keyboard.java Executable file → Normal file
View File

@@ -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++;