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

am 47b71c82: Fix keyStyle flags handling 

* commit '47b71c82eca80b06e76d960c4a501b9a6c64654b':
  Fix keyStyle flags handling
main
Tadashi G. Takaoka 2013-08-29 01:34:26 -07:00 committed by Android Git Automerger
parent 0f0d7a9b1c 47b71c82ec
commit 38daab1805
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
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 int flags = a.getInt(index, (value != null) ? value : 0);
final KeyStyle parentStyle = mStyles.get(mParentStyleName);
return flags | parentStyle.getFlags(a, index);
final int styleFlags = (value != null) ? value : 0;
final int flags = a.getInt(index, 0);
return flags | styleFlags | parentFlags;
}
public void readKeyAttributes(final TypedArray keyAttr) {
@ -163,7 +164,8 @@ public final class KeyStylesSet {
private void readFlags(final TypedArray a, final int index) {
if (a.hasValue(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);
}
}