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

Merge "Key should be distinguished also by moreKeys contents and etc."

main
Tadashi G. Takaoka 2012-02-09 23:51:18 -08:00 committed by Android (Google) Code Review
parent 4baf767fac fdb6999e55
commit b9e10c318a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/src/com/android/inputmethod/keyboard/Key.java
View File

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