From 73084c9cd30dacb6228a0851efa928aaeabcb229 Mon Sep 17 00:00:00 2001 From: steckbrief Date: Thu, 11 Feb 2016 21:20:51 +0100 Subject: Fixed XML errors after merge --- src/main/res/layout/conversation_list_row.xml | 4 ++-- src/main/res/layout/message_received.xml | 6 +++--- src/main/res/layout/message_sent.xml | 7 ++++--- src/main/res/values-de/strings.xml | 2 ++ src/main/res/values/colors.xml | 1 + src/main/res/values/strings.xml | 2 ++ 6 files changed, 14 insertions(+), 8 deletions(-) (limited to 'src/main') diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index cde94087..9f040676 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -1,6 +1,6 @@ + app:emojiconSize="20sp" /> @@ -58,7 +58,7 @@ android:textColor="@color/white" android:textColorHighlight="@color/grey800" android:textSize="?attr/TextSizeBody" - emojicon:emojiconSize="28sp" /> + app:emojiconSize="28sp" />