am 47b71c82: Fix keyStyle flags handling (38daab18) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}
	}		}