diff options
| author | jaguillo | 2015-10-27 14:39:27 +0100 |
|---|---|---|
| committer | jaguillo | 2015-10-27 14:39:27 +0100 |
| commit | ed53b1a23b25085305dbb5a14a9ec76121d171da (patch) | |
| tree | b8dbbb1b90d6907e2a89591f92783436aa032e09 /srcs/juloo.keyboard2 | |
| parent | 2c859f30a64606377c8b9ee5bb7eea3e8389b51f (diff) | |
| download | unexpected-keyboard-ed53b1a23b25085305dbb5a14a9ec76121d171da.tar.gz unexpected-keyboard-ed53b1a23b25085305dbb5a14a9ec76121d171da.zip | |
Fix crash + Fix emoji type buttons
Diffstat (limited to 'srcs/juloo.keyboard2')
| -rw-r--r-- | srcs/juloo.keyboard2/EmojiGridView.java | 2 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/EmojiTypeButton.java | 3 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/KeyValue.java | 5 |
3 files changed, 2 insertions, 8 deletions
diff --git a/srcs/juloo.keyboard2/EmojiGridView.java b/srcs/juloo.keyboard2/EmojiGridView.java index deb726f..bb852ee 100644 --- a/srcs/juloo.keyboard2/EmojiGridView.java +++ b/srcs/juloo.keyboard2/EmojiGridView.java @@ -111,7 +111,7 @@ public class EmojiGridView extends GridView emoji = Emoji.getEmojiByName(data[1]); if (emoji == null) continue ; - _lastUsed.put(emoji, Integer.getInteger(data[0])); + _lastUsed.put(emoji, Integer.valueOf(data[0])); } } diff --git a/srcs/juloo.keyboard2/EmojiTypeButton.java b/srcs/juloo.keyboard2/EmojiTypeButton.java index 8a36926..d88bff8 100644 --- a/srcs/juloo.keyboard2/EmojiTypeButton.java +++ b/srcs/juloo.keyboard2/EmojiTypeButton.java @@ -15,8 +15,7 @@ public class EmojiTypeButton extends Button public EmojiTypeButton(Context context, AttributeSet attrs) { - super(context); - setBackgroundColor(getResources().getColor(R.color.emoji_button_bg)); + super(context, attrs); setOnTouchListener(this); _emojiType = getTypeByString(attrs.getAttributeValue(null, "emoji_type")); } diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index 6ad2509..f13ad54 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -94,11 +94,6 @@ class KeyValue return (_flags); } - public boolean equals(Object o) - { - return (o instanceof KeyValue && ((KeyValue)o).getName().equals(_name)); - } - private static HashMap<String, KeyValue> keys = new HashMap<String, KeyValue>(); protected KeyValue(String name, String symbol, char c, int eventCode, int flags) |