am 221929c6: Keyboard.Row can have keyLabelFlags attribute

* commit '221929c64302579dd7b4c02d8fab3aed3b8ec8db':
  Keyboard.Row can have keyLabelFlags attribute
This commit is contained in:
Tadashi G. Takaoka 2013-08-18 20:10:55 -07:00 committed by Android Git Automerger
commit ba24343a24

View file

@ -64,12 +64,11 @@ public final class KeyboardRow {
R.styleable.Keyboard_Key); R.styleable.Keyboard_Key);
mDefaultKeyWidth = keyAttr.getFraction(R.styleable.Keyboard_Key_keyWidth, mDefaultKeyWidth = keyAttr.getFraction(R.styleable.Keyboard_Key_keyWidth,
params.mBaseWidth, params.mBaseWidth, params.mDefaultKeyWidth); params.mBaseWidth, params.mBaseWidth, params.mDefaultKeyWidth);
mDefaultKeyLabelFlags = keyAttr.getInt(R.styleable.Keyboard_Key_keyLabelFlags, 0);
mDefaultBackgroundType = keyAttr.getInt(R.styleable.Keyboard_Key_backgroundType, mDefaultBackgroundType = keyAttr.getInt(R.styleable.Keyboard_Key_backgroundType,
Key.BACKGROUND_TYPE_NORMAL); Key.BACKGROUND_TYPE_NORMAL);
keyAttr.recycle(); keyAttr.recycle();
// TODO: Initialize this with <Row> attribute as backgroundType is done.
mDefaultKeyLabelFlags = 0;
mCurrentY = y; mCurrentY = y;
mCurrentX = 0.0f; mCurrentX = 0.0f;
} }