aboutsummaryrefslogtreecommitdiffstats
path: root/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-29 20:58:44 +0200
committerlookshe <github@lookshe.org>2016-03-30 01:02:00 +0200
commitb8f97a7072d37e6aab26238a5620991b0b8a14ce (patch)
tree98b29678475fd4e4ef984fb7ca44c903c756fbd8 /libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
parent403e5696d2c86777efa5efbda56554edc5368aa1 (diff)
Fixes FS#174: Displaying of ASCII emoticons differs
Diffstat (limited to '')
-rw-r--r--libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
index 5822e478..4f63c30a 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
@@ -63,8 +63,12 @@ public class EmojiconTextView extends TextView {
@Override
public void setText(CharSequence text, BufferType type) {
SpannableStringBuilder builder = new SpannableStringBuilder(text);
- EmojiconHandler.addEmojis(getContext(), builder, mEmojiconSize, mTextStart, mTextLength);
- super.setText(builder, type);
+ boolean hasChanges = EmojiconHandler.addEmojis(getContext(), builder, mEmojiconSize, mTextStart, mTextLength);
+ if (hasChanges) {
+ super.setText(builder, BufferType.SPANNABLE);
+ } else {
+ super.setText(text, type);
+ }
}
/**