am 4a3c0918: Merge "Fix KeyStyles to be able to override the value in style"
* commit '4a3c0918dc3049e3e680a899f9c10b95e579368c': Fix KeyStyles to be able to override the value in stylemain
commit
97d6c71d85
|
@ -228,9 +228,9 @@ public class Key {
|
||||||
mDisabledIconId = style.getInt(keyAttr,
|
mDisabledIconId = style.getInt(keyAttr,
|
||||||
R.styleable.Keyboard_Key_keyIconDisabled, KeyboardIconsSet.ICON_UNDEFINED);
|
R.styleable.Keyboard_Key_keyIconDisabled, KeyboardIconsSet.ICON_UNDEFINED);
|
||||||
|
|
||||||
mLabelFlags = style.getFlag(keyAttr, R.styleable.Keyboard_Key_keyLabelFlags, 0);
|
mLabelFlags = style.getFlag(keyAttr, R.styleable.Keyboard_Key_keyLabelFlags);
|
||||||
final boolean preserveCase = (mLabelFlags & LABEL_FLAGS_PRESERVE_CASE) != 0;
|
final boolean preserveCase = (mLabelFlags & LABEL_FLAGS_PRESERVE_CASE) != 0;
|
||||||
int actionFlags = style.getFlag(keyAttr, R.styleable.Keyboard_Key_keyActionFlags, 0);
|
int actionFlags = style.getFlag(keyAttr, R.styleable.Keyboard_Key_keyActionFlags);
|
||||||
final String[] additionalMoreKeys = style.getStringArray(
|
final String[] additionalMoreKeys = style.getStringArray(
|
||||||
keyAttr, R.styleable.Keyboard_Key_additionalMoreKeys);
|
keyAttr, R.styleable.Keyboard_Key_additionalMoreKeys);
|
||||||
final String[] moreKeys = KeySpecParser.insertAddtionalMoreKeys(style.getStringArray(
|
final String[] moreKeys = KeySpecParser.insertAddtionalMoreKeys(style.getStringArray(
|
||||||
|
|
|
@ -40,17 +40,13 @@ public class KeyStyles {
|
||||||
public String[] getStringArray(TypedArray a, int index);
|
public String[] getStringArray(TypedArray a, int index);
|
||||||
public String getString(TypedArray a, int index);
|
public String getString(TypedArray a, int index);
|
||||||
public int getInt(TypedArray a, int index, int defaultValue);
|
public int getInt(TypedArray a, int index, int defaultValue);
|
||||||
public int getFlag(TypedArray a, int index, int defaultValue);
|
public int getFlag(TypedArray a, int index);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class EmptyKeyStyle implements KeyStyle {
|
static class EmptyKeyStyle implements KeyStyle {
|
||||||
EmptyKeyStyle() {
|
|
||||||
// Nothing to do.
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getStringArray(TypedArray a, int index) {
|
public String[] getStringArray(TypedArray a, int index) {
|
||||||
return parseStringArray(a, index);
|
return KeyStyles.parseStringArray(a, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -64,50 +60,47 @@ public class KeyStyles {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getFlag(TypedArray a, int index, int defaultValue) {
|
public int getFlag(TypedArray a, int index) {
|
||||||
return a.getInt(index, defaultValue);
|
return a.getInt(index, 0);
|
||||||
}
|
|
||||||
|
|
||||||
protected static String[] parseStringArray(TypedArray a, int index) {
|
|
||||||
if (!a.hasValue(index))
|
|
||||||
return null;
|
|
||||||
return KeySpecParser.parseCsvString(
|
|
||||||
a.getString(index), a.getResources(), R.string.english_ime_name);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class DeclaredKeyStyle extends EmptyKeyStyle {
|
static class DeclaredKeyStyle implements KeyStyle {
|
||||||
private final HashMap<Integer, Object> mAttributes = new HashMap<Integer, Object>();
|
private final HashMap<Integer, Object> mStyleAttributes = new HashMap<Integer, Object>();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getStringArray(TypedArray a, int index) {
|
public String[] getStringArray(TypedArray a, int index) {
|
||||||
return a.hasValue(index)
|
if (a.hasValue(index)) {
|
||||||
? super.getStringArray(a, index) : (String[])mAttributes.get(index);
|
return parseStringArray(a, index);
|
||||||
|
}
|
||||||
|
return (String[])mStyleAttributes.get(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getString(TypedArray a, int index) {
|
public String getString(TypedArray a, int index) {
|
||||||
return a.hasValue(index)
|
if (a.hasValue(index)) {
|
||||||
? super.getString(a, index) : (String)mAttributes.get(index);
|
return a.getString(index);
|
||||||
|
}
|
||||||
|
return (String)mStyleAttributes.get(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getInt(TypedArray a, int index, int defaultValue) {
|
public int getInt(TypedArray a, int index, int defaultValue) {
|
||||||
final Integer value = (Integer)mAttributes.get(index);
|
if (a.hasValue(index)) {
|
||||||
return super.getInt(a, index, (value != null) ? value : defaultValue);
|
return a.getInt(index, defaultValue);
|
||||||
|
}
|
||||||
|
final Integer styleValue = (Integer)mStyleAttributes.get(index);
|
||||||
|
return styleValue != null ? styleValue : defaultValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getFlag(TypedArray a, int index, int defaultValue) {
|
public int getFlag(TypedArray a, int index) {
|
||||||
final Integer value = (Integer)mAttributes.get(index);
|
final int value = a.getInt(index, 0);
|
||||||
return super.getFlag(a, index, defaultValue) | (value != null ? value : 0);
|
final Integer styleValue = (Integer)mStyleAttributes.get(index);
|
||||||
|
return (styleValue != null ? styleValue : 0) | value;
|
||||||
}
|
}
|
||||||
|
|
||||||
DeclaredKeyStyle() {
|
void readKeyAttributes(TypedArray keyAttr) {
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
void parseKeyStyleAttributes(TypedArray keyAttr) {
|
|
||||||
// TODO: Currently not all Key attributes can be declared as style.
|
// TODO: Currently not all Key attributes can be declared as style.
|
||||||
readInt(keyAttr, R.styleable.Keyboard_Key_code);
|
readInt(keyAttr, R.styleable.Keyboard_Key_code);
|
||||||
readInt(keyAttr, R.styleable.Keyboard_Key_altCode);
|
readInt(keyAttr, R.styleable.Keyboard_Key_altCode);
|
||||||
|
@ -126,52 +119,68 @@ public class KeyStyles {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void readString(TypedArray a, int index) {
|
private void readString(TypedArray a, int index) {
|
||||||
if (a.hasValue(index))
|
if (a.hasValue(index)) {
|
||||||
mAttributes.put(index, a.getString(index));
|
mStyleAttributes.put(index, a.getString(index));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void readInt(TypedArray a, int index) {
|
private void readInt(TypedArray a, int index) {
|
||||||
if (a.hasValue(index))
|
if (a.hasValue(index)) {
|
||||||
mAttributes.put(index, a.getInt(index, 0));
|
mStyleAttributes.put(index, a.getInt(index, 0));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void readFlag(TypedArray a, int index) {
|
private void readFlag(TypedArray a, int index) {
|
||||||
final Integer value = (Integer)mAttributes.get(index);
|
final Integer value = (Integer)mStyleAttributes.get(index);
|
||||||
if (a.hasValue(index))
|
if (a.hasValue(index)) {
|
||||||
mAttributes.put(index, a.getInt(index, 0) | (value != null ? value : 0));
|
mStyleAttributes.put(index, a.getInt(index, 0) | (value != null ? value : 0));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void readStringArray(TypedArray a, int index) {
|
private void readStringArray(TypedArray a, int index) {
|
||||||
final String[] value = parseStringArray(a, index);
|
final String[] value = parseStringArray(a, index);
|
||||||
if (value != null)
|
if (value != null) {
|
||||||
mAttributes.put(index, value);
|
mStyleAttributes.put(index, value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void addParent(DeclaredKeyStyle parentStyle) {
|
void addParentStyleAttributes(DeclaredKeyStyle parentStyle) {
|
||||||
mAttributes.putAll(parentStyle.mAttributes);
|
mStyleAttributes.putAll(parentStyle.mStyleAttributes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static String[] parseStringArray(TypedArray a, int index) {
|
||||||
|
if (a.hasValue(index)) {
|
||||||
|
return KeySpecParser.parseCsvString(
|
||||||
|
a.getString(index), a.getResources(), R.string.english_ime_name);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public void parseKeyStyleAttributes(TypedArray keyStyleAttr, TypedArray keyAttrs,
|
public void parseKeyStyleAttributes(TypedArray keyStyleAttr, TypedArray keyAttrs,
|
||||||
XmlPullParser parser) throws XmlPullParserException {
|
XmlPullParser parser) throws XmlPullParserException {
|
||||||
final String styleName = keyStyleAttr.getString(R.styleable.Keyboard_KeyStyle_styleName);
|
final String styleName = keyStyleAttr.getString(R.styleable.Keyboard_KeyStyle_styleName);
|
||||||
if (DEBUG) Log.d(TAG, String.format("<%s styleName=%s />",
|
if (DEBUG) {
|
||||||
Keyboard.Builder.TAG_KEY_STYLE, styleName));
|
Log.d(TAG, String.format("<%s styleName=%s />",
|
||||||
if (mStyles.containsKey(styleName))
|
Keyboard.Builder.TAG_KEY_STYLE, styleName));
|
||||||
|
}
|
||||||
|
if (mStyles.containsKey(styleName)) {
|
||||||
throw new XmlParseUtils.ParseException(
|
throw new XmlParseUtils.ParseException(
|
||||||
"duplicate key style declared: " + styleName, parser);
|
"duplicate key style declared: " + styleName, parser);
|
||||||
|
}
|
||||||
|
|
||||||
final DeclaredKeyStyle style = new DeclaredKeyStyle();
|
final DeclaredKeyStyle style = new DeclaredKeyStyle();
|
||||||
if (keyStyleAttr.hasValue(R.styleable.Keyboard_KeyStyle_parentStyle)) {
|
if (keyStyleAttr.hasValue(R.styleable.Keyboard_KeyStyle_parentStyle)) {
|
||||||
final String parentStyle = keyStyleAttr.getString(
|
final String parentStyle = keyStyleAttr.getString(
|
||||||
R.styleable.Keyboard_KeyStyle_parentStyle);
|
R.styleable.Keyboard_KeyStyle_parentStyle);
|
||||||
final DeclaredKeyStyle parent = mStyles.get(parentStyle);
|
final DeclaredKeyStyle parent = mStyles.get(parentStyle);
|
||||||
if (parent == null)
|
if (parent == null) {
|
||||||
throw new XmlParseUtils.ParseException(
|
throw new XmlParseUtils.ParseException(
|
||||||
"Unknown parentStyle " + parentStyle, parser);
|
"Unknown parentStyle " + parentStyle, parser);
|
||||||
style.addParent(parent);
|
}
|
||||||
|
style.addParentStyleAttributes(parent);
|
||||||
}
|
}
|
||||||
style.parseKeyStyleAttributes(keyAttrs);
|
style.readKeyAttributes(keyAttrs);
|
||||||
mStyles.put(styleName, style);
|
mStyles.put(styleName, style);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue