diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-02-11 21:20:51 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-02-11 21:20:51 +0100 |
commit | 73084c9cd30dacb6228a0851efa928aaeabcb229 (patch) | |
tree | 894754dbba9d3a7339fbaf8032422c13b08b30eb /src/main/res/layout/conversation_list_row.xml | |
parent | f7abd4237f0b8441fcba45459e26b8a0ea1d36de (diff) |
Fixed XML errors after merge
Diffstat (limited to 'src/main/res/layout/conversation_list_row.xml')
-rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" @@ -88,7 +88,7 @@ android:text="This is a placeholder text to show the last messages" android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" - emojicon:emojiconSize="20sp" /> + app:emojiconSize="20sp" /> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/conversation_lastimage" |