diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 16:15:43 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 16:15:43 +0100 |
| commit | d1e2023bd9b64d405af9648635ca17f0a7ff1010 (patch) | |
| tree | 26741b1cd11ba167ec06b163738d9b7097ef76d9 /src/main/res/layout/fragment_conversation.xml | |
| parent | 50dad467eeb63e767777733e9b280864f16e81f7 (diff) | |
| parent | 90bbe035e9efdff72241c8a0d87000fdba482a6b (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/layout/fragment_conversation.xml')
| -rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index d14091fd..dd102177 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -55,7 +55,8 @@ android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingTop="12dp" - android:textColor="@color/primaryText" > + android:textColor="@color/primaryText" + app:emojiconSize="?attr/EmojiconSizeInput" > <requestFocus /> </eu.siacs.conversations.ui.EditMessage> |