From b65b7cb5808a3cea59cbfa72ecd46bdda90351fa Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 17 Sep 2010 15:28:47 +0900
Subject: [PATCH] Initialize Keyboard.Key attributes from parent Keyboard.Row

Bug: 3009940
Change-Id: I22ef3e507c31e46b7581e20bcdd6b5ebc750adfe
---
 core/java/android/inputmethodservice/Keyboard.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 core/java/android/inputmethodservice/Keyboard.java

diff --git a/core/java/android/inputmethodservice/Keyboard.java b/core/java/android/inputmethodservice/Keyboard.java
old mode 100755
new mode 100644
index 4814b0aa4c379..269e1c9d3e900
--- 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++;