aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-08-16 23:44:01 +0200
committerlookshe <github@lookshe.org>2015-08-16 23:44:01 +0200
commit3eb138729946666395a017d38808de401ec8f541 (patch)
tree93185534565d08a0685b9007a1e28bd13f01722e
parentcaefd38f96a3a9d8cf51ea2a672daf76c7e237b6 (diff)
parentb936af529ff541711500189a1b303ff43757892c (diff)
Merge branch 'trz/rebase' into trz/rename
-rw-r--r--libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
index 3e032c42..958ac760 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
@@ -19,7 +19,6 @@ import github.ankushsachdeva.emojicon.R;
import android.content.Context;
import android.text.Spannable;
-import android.text.style.ImageSpan;
import android.util.SparseIntArray;
import java.util.HashMap;
@@ -1436,7 +1435,7 @@ public final class EmojiconHandler {
private static boolean getSmiledText(Context context, Spannable spannable) {
// remove spans throughout all text
- ImageSpan[] oldSpans = spannable.getSpans(0, spannable.length(), EmojiconImageSpan.class);
+ EmojiconImageSpan[] oldSpans = spannable.getSpans(0, spannable.length(), EmojiconImageSpan.class);
for (int i = 0; i < oldSpans.length; i++) {
spannable.removeSpan(oldSpans[i]);
}