Add Key.getIconId for testability (deb5cedf) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/Key.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -716,10 +716,14 @@ public class Key implements Comparable<Key> {
		return (attrs != null) ? attrs.mAltCode : CODE_UNSPECIFIED;
		}

		public int getIconId() {
		return mIconId;
		}

		public Drawable getIcon(final KeyboardIconsSet iconSet, final int alpha) {
		final OptionalAttributes attrs = mOptionalAttributes;
		final int disabledIconId = (attrs != null) ? attrs.mDisabledIconId : ICON_UNDEFINED;
		final int iconId = mEnabled ? mIconId : disabledIconId;
		final int iconId = mEnabled ? getIconId() : disabledIconId;
		final Drawable icon = iconSet.getIconDrawable(iconId);
		if (icon != null) {
		icon.setAlpha(alpha);
		@@ -731,7 +735,7 @@ public class Key implements Comparable<Key> {
		final OptionalAttributes attrs = mOptionalAttributes;
		final int previewIconId = (attrs != null) ? attrs.mPreviewIconId : ICON_UNDEFINED;
		return previewIconId != ICON_UNDEFINED
		? iconSet.getIconDrawable(previewIconId) : iconSet.getIconDrawable(mIconId);
		? iconSet.getIconDrawable(previewIconId) : iconSet.getIconDrawable(getIconId());
		}

		public int getWidth() {

+1 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ public final class KeyboardIconsSet {
		return isValidIconId(iconId) ? ICON_NAMES[iconId] : "unknown<" + iconId + ">";
		}

		static int getIconId(final String name) {
		public static int getIconId(final String name) {
		Integer iconId = sNameToIdsMap.get(name);
		if (iconId != null) {
		return iconId;