diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2012-02-02 21:24:09 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-02-02 21:33:50 +0900 |
| commit | 44e0e4f99e70b84176ff5c985e456b821a8f0b14 (patch) | |
| tree | ffe8b4f86d3ed8415f4af24d1b8b03c3562b99ac /java/src/com/android/inputmethod/keyboard/Key.java | |
| parent | c373585f089917a41f4d77f6d09264b964636694 (diff) | |
Fix Key.equals(Key)
Bug: 5956068
Change-Id: I2901ae28bd9121ec4f4429a53b83aae128b75e0c
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/Key.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 8f2efab29..a6c9fd485 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -364,8 +364,8 @@ public class Key { && o.mCode == mCode && TextUtils.equals(o.mLabel, mLabel) && TextUtils.equals(o.mHintLabel, mHintLabel) - && o.mIconAttrId != mIconAttrId - && o.mBackgroundType != mBackgroundType; + && o.mIconAttrId == mIconAttrId + && o.mBackgroundType == mBackgroundType; } @Override @@ -380,11 +380,20 @@ public class Key { @Override public String toString() { - String top = Keyboard.printableCode(mCode); - if (Utils.codePointCount(mLabel) != 1) { - top += "/\"" + mLabel + '"'; + return String.format("%s/%s %d,%d %dx%d %s/%s/%s", + Keyboard.printableCode(mCode), mLabel, mX, mY, mWidth, mHeight, mHintLabel, + KeyboardIconsSet.getIconName(mIconAttrId), backgroundName(mBackgroundType)); + } + + private static String backgroundName(int backgroundType) { + switch (backgroundType) { + case BACKGROUND_TYPE_NORMAL: return "normal"; + case BACKGROUND_TYPE_FUNCTIONAL: return "functional"; + case BACKGROUND_TYPE_ACTION: return "action"; + case BACKGROUND_TYPE_STICKY_OFF: return "stickyOff"; + case BACKGROUND_TYPE_STICKY_ON: return "stickyOn"; + default: return null; } - return String.format("%s %d,%d", top, mX, mY); } public void markAsLeftEdge(Keyboard.Params params) { |