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

Commit a79433cb authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

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

Merge commit 'ecd43cca' into gingerbread-plus-aosp

* commit 'ecd43cca':
  Initialize Keyboard.Key attributes from parent Keyboard.Row
parents f3f822ed ecd43cca

core/java/android/inputmethodservice/Keyboard.java

100755 → 100644
+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++;