aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-08 23:21:44 +0100
committersteckbrief <steckbrief@chefmail.de>2016-03-08 23:22:36 +0100
commit9af0794911b7993b612d23b3851fc5f5754bb2a0 (patch)
tree68e8b00f6031e4c19ca4dbcbdbbb2101acabd499 /src/main/res/layout
parenta5243a8160bd9d939299a44db8e28331ac756911 (diff)
parent85bb3f537ae253d367c4be19305d4ad3c2bb8f76 (diff)
Merge remote branch 'master'
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/message_received.xml2
-rw-r--r--src/main/res/layout/message_sent.xml2
2 files changed, 0 insertions, 4 deletions
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 93ab095b..fa690872 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -54,9 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web|phone|email"
- android:textColorLink="@color/primaryText"
android:textColor="@color/primaryText"
- android:textColorHighlight="@color/grey500"
android:textSize="?attr/TextSizeBody"
app:emojiconSize="28sp" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 909ae9c7..b74347d4 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -54,9 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web|phone|email"
- android:textColorLink="@color/primaryText"
android:textColor="@color/primaryText"
- android:textColorHighlight="@color/grey500"
android:textSize="?attr/TextSizeBody"
app:emojiconSize="28sp"/>