aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/message_received.xml
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-02-11 21:20:51 +0100
committersteckbrief <steckbrief@chefmail.de>2016-02-11 21:20:51 +0100
commit73084c9cd30dacb6228a0851efa928aaeabcb229 (patch)
tree894754dbba9d3a7339fbaf8032422c13b08b30eb /src/main/res/layout/message_received.xml
parentf7abd4237f0b8441fcba45459e26b8a0ea1d36de (diff)
Fixed XML errors after merge
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/message_received.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 389b0f48..b68cc532 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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="vertical"
@@ -34,7 +34,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:background="@color/primarybackground"
+ android:background="@color/primaryBackground"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="2dp">
@@ -58,7 +58,7 @@
android:textColor="@color/white"
android:textColorHighlight="@color/grey800"
android:textSize="?attr/TextSizeBody"
- emojicon:emojiconSize="28sp" />
+ app:emojiconSize="28sp" />
<Button
android:id="@+id/download_button"