nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix keyStyle flags handling 

Change-Id: Ia0d21f7a00ff99eae89c746244484d6fa3f0f44e
main
Tadashi G. Takaoka 2013-08-29 17:17:28 +09:00
parent 4e6e9ef3b8
commit 47b71c82ec
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java
View File

@ -124,10 +124,11 @@ public final class KeyStylesSet {
@Override @Override
public int getFlags(final TypedArray a, final int index) { public int getFlags(final TypedArray a, final int index) {
final int parentFlags = mStyles.get(mParentStyleName).getFlags(a, index);
final Integer value = (Integer)mStyleAttributes.get(index); final Integer value = (Integer)mStyleAttributes.get(index);
final int flags = a.getInt(index, (value != null) ? value : 0); final int styleFlags = (value != null) ? value : 0;
final KeyStyle parentStyle = mStyles.get(mParentStyleName); final int flags = a.getInt(index, 0);
return flags | parentStyle.getFlags(a, index); return flags | styleFlags | parentFlags;
} }
public void readKeyAttributes(final TypedArray keyAttr) { public void readKeyAttributes(final TypedArray keyAttr) {
@ -163,7 +164,8 @@ public final class KeyStylesSet {
private void readFlags(final TypedArray a, final int index) { private void readFlags(final TypedArray a, final int index) {
if (a.hasValue(index)) { if (a.hasValue(index)) {
final Integer value = (Integer)mStyleAttributes.get(index); final Integer value = (Integer)mStyleAttributes.get(index);
mStyleAttributes.put(index, a.getInt(index, 0) | (value != null ? value : 0)); final int styleFlags = value != null ? value : 0;
mStyleAttributes.put(index, a.getInt(index, 0) | styleFlags);
} }
} }