Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecd43cca authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

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

parents 987ba541 b65b7cb5
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -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++;