From 972c65b775b2191ee5b54472e24958f3c87dbb21 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 12 Apr 2015 17:21:35 +0200
Subject: whatsapp-like smiley implemantation

---
 src/main/java/eu/siacs/conversations/ui/EditMessage.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
index a58cf2b8..a7aa2024 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
@@ -7,8 +7,9 @@ import android.view.KeyEvent;
 import android.widget.EditText;
 
 import eu.siacs.conversations.Config;
+import github.ankushsachdeva.emojicon.EmojiconEditText;
 
-public class EditMessage extends EditText {
+public class EditMessage extends EmojiconEditText {
 
 	public EditMessage(Context context, AttributeSet attrs) {
 		super(context, attrs);
-- 
cgit v1.2.3