diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-18 20:10:55 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-18 20:10:55 -0700 |
| commit | ba24343a24c57cc89468748211047dd6cd95195a (patch) | |
| tree | 6dffbca9fbbe782f761a41b49c0a458c6646db01 /java/src | |
| parent | ca723c70abbfa207e325d1f1d51b1ed5ef40285a (diff) | |
| parent | 221929c64302579dd7b4c02d8fab3aed3b8ec8db (diff) | |
| download | latinime-ba24343a24c57cc89468748211047dd6cd95195a.tar.gz latinime-ba24343a24c57cc89468748211047dd6cd95195a.tar.xz latinime-ba24343a24c57cc89468748211047dd6cd95195a.zip | |
am 221929c6: Keyboard.Row can have keyLabelFlags attribute
* commit '221929c64302579dd7b4c02d8fab3aed3b8ec8db':
Keyboard.Row can have keyLabelFlags attribute
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardRow.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardRow.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardRow.java index 80fe1eaa0..23c0b91e6 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardRow.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardRow.java @@ -64,12 +64,11 @@ public final class KeyboardRow { R.styleable.Keyboard_Key); mDefaultKeyWidth = keyAttr.getFraction(R.styleable.Keyboard_Key_keyWidth, params.mBaseWidth, params.mBaseWidth, params.mDefaultKeyWidth); + mDefaultKeyLabelFlags = keyAttr.getInt(R.styleable.Keyboard_Key_keyLabelFlags, 0); mDefaultBackgroundType = keyAttr.getInt(R.styleable.Keyboard_Key_backgroundType, Key.BACKGROUND_TYPE_NORMAL); keyAttr.recycle(); - // TODO: Initialize this with <Row> attribute as backgroundType is done. - mDefaultKeyLabelFlags = 0; mCurrentY = y; mCurrentX = 0.0f; } |