Key should be distinguished also by moreKeys contents and etc.
Change-Id: Ib2caabee6af78153b5a7be0e4df522288f2a7d48main
parent
accd2a9f61
commit
fdb6999e55
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue