aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/conversation_list_row.xml
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-20 16:15:43 +0100
committerlookshe <github@lookshe.org>2016-03-20 16:15:43 +0100
commitd1e2023bd9b64d405af9648635ca17f0a7ff1010 (patch)
tree26741b1cd11ba167ec06b163738d9b7097ef76d9 /src/main/res/layout/conversation_list_row.xml
parent50dad467eeb63e767777733e9b280864f16e81f7 (diff)
parent90bbe035e9efdff72241c8a0d87000fdba482a6b (diff)
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/layout/conversation_list_row.xml')
-rw-r--r--src/main/res/layout/conversation_list_row.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 9f040676..74e84593 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -88,7 +88,7 @@
android:text="This is a placeholder text to show the last messages"
android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
- app:emojiconSize="20sp" />
+ app:emojiconSize="?attr/EmojiconSizeBody" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/conversation_lastimage"