diff options
author | lookshe <github@lookshe.org> | 2016-03-30 01:02:32 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-03-30 01:02:32 +0200 |
commit | a8f667e11fdf801a1bdb7f6977440d1da5edb4fd (patch) | |
tree | 8698ba5a380556b0d2832777ccf5fda0b6602780 /libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java | |
parent | 5021c1c194af85947c413f15e2ed8d28e4594b8a (diff) | |
parent | 51d1d2226a2f41affdb79fdcffad25731077bafd (diff) |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java')
-rw-r--r-- | libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java | 8 |
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); + } } /** |