Merge "Key should be distinguished also by moreKeys contents and etc." (b9e10c31) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+9 −5

Original line number	Diff line number	Diff line
		@@ -335,18 +335,18 @@ public class Key {
		key.mHintLabel,
		key.mIconId,
		key.mBackgroundType,
		Arrays.hashCode(key.mMoreKeys),
		key.mOutputText,
		key.mActionFlags,
		key.mLabelFlags,
		// Key can be distinguishable without the following members.
		// key.mAltCode,
		// key.mOutputText,
		// key.mActionFlags,
		// key.mLabelFlags,
		// key.mDisabledIconId,
		// key.mPreviewIconId,
		// key.mHorizontalGap,
		// key.mVerticalGap,
		// key.mVisualInsetLeft,
		// key.mVisualInsetRight,
		// Arrays.hashCode(key.mMoreKeys),
		// key.mMaxMoreKeysColumn,
		});
		}
		@@ -361,7 +361,11 @@ public class Key {
		&& TextUtils.equals(o.mLabel, mLabel)
		&& TextUtils.equals(o.mHintLabel, mHintLabel)
		&& o.mIconId == mIconId
		&& o.mBackgroundType == mBackgroundType;
		&& o.mBackgroundType == mBackgroundType
		&& Arrays.equals(o.mMoreKeys, mMoreKeys)
		&& TextUtils.equals(o.mOutputText, mOutputText)
		&& o.mActionFlags == mActionFlags
		&& o.mLabelFlags == mLabelFlags;
		}

		@Override