diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2012-06-06 10:42:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-06 10:42:38 -0700 |
| commit | 562239bf5151e52e90bd26d1440d94e12a3c7cda (patch) | |
| tree | a770412827698dc16cf699f1f32e555f4a929133 /java/src/com/android/inputmethod/keyboard/Key.java | |
| parent | 2bf014d2a81f25e15596c02abe296665ff760e51 (diff) | |
| parent | 59dae7e141b6d6a8bea287f6699e34137390c5f9 (diff) | |
am 59dae7e1: am 907ba593: Can specify Key.backgroundType in <Row> and <include> attribute
* commit '59dae7e141b6d6a8bea287f6699e34137390c5f9':
Can specify Key.backgroundType in <Row> and <include> attribute
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/Key.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index ed873a70d..e1e1ca9cf 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -227,7 +227,7 @@ public class Key { row.setXPos(keyXPos + keyWidth); mBackgroundType = style.getInt(keyAttr, - R.styleable.Keyboard_Key_backgroundType, BACKGROUND_TYPE_NORMAL); + R.styleable.Keyboard_Key_backgroundType, row.getDefaultBackgroundType()); mVisualInsetsLeft = Math.round(Keyboard.Builder.getDimensionOrFraction(keyAttr, R.styleable.Keyboard_Key_visualInsetsLeft, params.mBaseWidth, 0)); |